[haiku-commits] haiku: hrev46128 - in src: tools/get_package_dependencies build/libsolv
- From: niels.reedijk@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 29 Sep 2013 11:57:09 +0200 (CEST)
hrev46128 adds 3 changesets to branch 'master'
old head: 0e1ec24ac039a2f6803c83c09369a043fa43f17e
new head: b5a871b1bf06bb62a4de95bcde6bdd748c0bfb8a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b5a871b+%5E0e1ec24
----------------------------------------------------------------------------
8ce48ae: Add HOST_LIBSUPC++ to fix compilation on MacOS X
3e3ffe6: Set defines for Mac OS X so that libsolv can be built
b5a871b: shasum -a 256 is an alternative for sha256 on Mac OS X
First set of patches from #10028
[ Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 1 deletion(-)
configure | 2 ++
src/build/libsolv/Jamfile | 2 ++
src/tools/get_package_dependencies/Jamfile | 2 +-
############################################################################
Commit: 8ce48ae5811690cd1da05afa33cefc88d0fbddc4
URL: http://cgit.haiku-os.org/haiku/commit/?id=8ce48ae
Author: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Date: Sun Sep 29 08:52:05 2013 UTC
Add HOST_LIBSUPC++ to fix compilation on MacOS X
----------------------------------------------------------------------------
diff --git a/src/tools/get_package_dependencies/Jamfile
b/src/tools/get_package_dependencies/Jamfile
index 90e636d..0bba9b0 100644
--- a/src/tools/get_package_dependencies/Jamfile
+++ b/src/tools/get_package_dependencies/Jamfile
@@ -11,5 +11,5 @@ BuildPlatformMain <build>get_package_dependencies :
:
libpackage-add-on-libsolv_build.so
libsolvext_build.so libsolv_build.so
- libpackage_build.so $(HOST_LIBBE) $(HOST_LIBSTDC++)
+ libpackage_build.so $(HOST_LIBBE) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
;
############################################################################
Commit: 3e3ffe68580992a7b7f04f4e9499e1bcae7739e6
URL: http://cgit.haiku-os.org/haiku/commit/?id=3e3ffe6
Author: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Date: Sun Sep 29 08:23:42 2013 UTC
Set defines for Mac OS X so that libsolv can be built
----------------------------------------------------------------------------
diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index 10cc075..9f3f9fa 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -30,6 +30,8 @@ switch $(HOST_PLATFORM) {
DEFINES += HAVE_FOPENCOOKIE ;
case freebsd :
DEFINES += HAVE_FUNOPEN ;
+ case darwin :
+ DEFINES += HAVE_FUNOPEN HAVE_QSORT_R ;
case * :
Exit $(SUBDIR)/Jamfile: "Please add a case for your platform"
"($(HOST_PLATFORM))!" ;
############################################################################
Revision: hrev46128
Commit: b5a871b1bf06bb62a4de95bcde6bdd748c0bfb8a
URL: http://cgit.haiku-os.org/haiku/commit/?id=b5a871b
Author: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Date: Sun Sep 29 08:21:06 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/10028
shasum -a 256 is an alternative for sha256 on Mac OS X
First set of patches from #10028
----------------------------------------------------------------------------
diff --git a/configure b/configure
index 0351300..9bcba39 100755
--- a/configure
+++ b/configure
@@ -482,6 +482,8 @@ if sha256sum < /dev/null > /dev/null 2>&1; then
HOST_SHA256=sha256sum
elif sha256 < /dev/null > /dev/null 2>&1; then
HOST_SHA256="sha256 -q"
+elif shasum < /dev/null > /dev/null 2>&1; then
+ HOST_SHA256="shasum -a 256"
else
echo "Error: Neither sha256sum nor sha256 seem to be available!" >&2
exit 1
Other related posts:
- » [haiku-commits] haiku: hrev46128 - in src: tools/get_package_dependencies build/libsolv - niels . reedijk
