Kelson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/216530 )
Change subject: Fixed wrong libmagic path
......................................................................
Fixed wrong libmagic path
Change-Id: Ic7674a62530abde447252fd6c0b693a8d741443e
---
M zimwriterfs/macosx-build.sh
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Kelson: Verified; Looks good to me, approved
diff --git a/zimwriterfs/macosx-build.sh b/zimwriterfs/macosx-build.sh
index 6f2e3bc..ae38a39 100755
--- a/zimwriterfs/macosx-build.sh
+++ b/zimwriterfs/macosx-build.sh
@@ -10,10 +10,9 @@
LIBZIM_DIR="${ZIM_DIR}/build/lib"
LZMA_DIR="${KIWIX_ROOT}/src/dependencies/xz/build"
LIBLZMA_DIR="${LZMA_DIR}/lib"
-MAGIC_DIR="/usr/local"
+MAGIC_DIR="/usr/local/Cellar/libmagic/5.22_1"
LIBMAGIC_DIR="${MAGIC_DIR}/lib"
STATIC_LDFLAGS="${LIBZIM_DIR}/libzim.a ${LIBLZMA_DIR}/liblzma.a
${LIBMAGIC_DIR}/libmagic.a -lz"
-#LDFLAGS="-L${KIWIX_ROOT}/src/dependencies/zimlib-1.2/build/lib/ -lzim
-L${KIWIX_ROOT}/src/dependencies/xz/build/lib/ -llzma
-L/usr/local/Cellar/libmagic/5.22_1/lib/ -lmagic -lz"
CC="clang -O3"
CXX="clang++ -O3"
--
To view, visit https://gerrit.wikimedia.org/r/216530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7674a62530abde447252fd6c0b693a8d741443e
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Rgaudin <[email protected]>
Gerrit-Reviewer: Kelson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
