diff options
| author | lioux <lioux@FreeBSD.org> | 2009-04-24 19:20:13 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2009-04-24 19:20:13 +0800 |
| commit | 4bdc2dab8492cf1dd63a43dc7fe8f00dc59c2a31 (patch) | |
| tree | 3093467bddeefe0f3c326e9d199915cf10605d75 | |
| parent | c7ea819f310adb74110ace487a193d3583cfc360 (diff) | |
| download | freebsd-ports-gnome-4bdc2dab8492cf1dd63a43dc7fe8f00dc59c2a31.tar.gz freebsd-ports-gnome-4bdc2dab8492cf1dd63a43dc7fe8f00dc59c2a31.tar.zst freebsd-ports-gnome-4bdc2dab8492cf1dd63a43dc7fe8f00dc59c2a31.zip | |
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.
| -rw-r--r-- | math/libjbigi/Makefile | 5 | ||||
| -rw-r--r-- | math/libjbigi/files/patch-jbigi__build_jbigi.sh | 2 |
2 files changed, 5 insertions, 2 deletions
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 <bsd.port.pre.mk> -.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 |