From 4bdc2dab8492cf1dd63a43dc7fe8f00dc59c2a31 Mon Sep 17 00:00:00 2001 From: lioux Date: Fri, 24 Apr 2009 11:20:13 +0000 Subject: o Fix build on amd64: do not try to build JCPUID on amd64 ARCH since it requires "-fPIC" on linking (but it breaks when used). o Use '-fPIC' on all other targets. --- math/libjbigi/Makefile | 5 ++++- math/libjbigi/files/patch-jbigi__build_jbigi.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'math/libjbigi') diff --git a/math/libjbigi/Makefile b/math/libjbigi/Makefile index 82b2dafa8d41..cea9daaad931 100644 --- a/math/libjbigi/Makefile +++ b/math/libjbigi/Makefile @@ -42,8 +42,11 @@ do-install: .include -.if ${ARCH} == "i386" || ${ARCH} == "amd64" +.if ${ARCH} == "i386" JBIGI_BUILD_JCPUID= yes +.endif + +.if ${ARCH} == "i386" || ${ARCH} == "amd64" JBIGI_LIBS+= libjbigi-freebsd-x86.so .endif diff --git a/math/libjbigi/files/patch-jbigi__build_jbigi.sh b/math/libjbigi/files/patch-jbigi__build_jbigi.sh index 2ccb4d750882..c2868ac0dc6f 100644 --- a/math/libjbigi/files/patch-jbigi__build_jbigi.sh +++ b/math/libjbigi/files/patch-jbigi__build_jbigi.sh @@ -17,7 +17,7 @@ - LINKFLAGS="-shared -Wl,-soname,libjbigi.so" + COMPILEFLAGS="-Wall ${CFLAGS}" + INCLUDES="-I. -I${LOCALBASE}/include -Ijbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/freebsd" -+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so ${LDFLAGS}" ++ LINKFLAGS="-shared -Wl,-soname,libjbigi.so ${LDFLAGS} -fPIC" LIBFILE="libjbigi.so";; esac -- cgit