View | Details | Raw Unified | Return to bug 131713 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +2 lines)
Lines 18-23 Link Here
18
18
19
WRKSRC=		${WRKDIR}/gpac
19
WRKSRC=		${WRKDIR}/gpac
20
ALL_TARGET=	lib
20
ALL_TARGET=	lib
21
USE_GL=		gl glu glut
21
USE_GMAKE=	yes
22
USE_GMAKE=	yes
22
HAS_CONFIGURE=	yes
23
HAS_CONFIGURE=	yes
23
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
Lines 26-32 Link Here
26
INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
27
INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
27
LIBVER=	1
28
LIBVER=	1
28
29
29
CONFIGURE_ARGS=	--cc="${CC}" \
30
CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${X11BASE}" \
30
		--extra-cflags="${CFLAGS} ${PTHREAD_CFLAGS} -fPIC" \
31
		--extra-cflags="${CFLAGS} ${PTHREAD_CFLAGS} -fPIC" \
31
		--extra-ldflags="${LDFLAGS} ${PTHREAD_LIBS}"
32
		--extra-ldflags="${LDFLAGS} ${PTHREAD_LIBS}"
32
33
(-)files/patch-configure (+44 lines)
Added Link Here
1
--- configure.orig	2008-12-02 13:04:42.000000000 -0500
2
+++ configure	2009-02-17 13:34:33.000000000 -0500
3
@@ -33,6 +33,7 @@
4
 make="make"
5
 strip="strip"
6
 cpu=`uname -m`
7
+targetos=`uname -s`
8
 debuginfo="no"
9
 sdl_path=""
10
 sdl_local="no"
11
@@ -222,10 +223,12 @@
12
     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
13
       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
14
         cpu="x86_64"
15
-	libdir="lib64"
16
-        #that's a bit crude...
17
-        PIC_CFLAGS="-fPIC -DPIC"
18
-        want_pic="yes"
19
+        if [ x"$targetos" != x"FreeBSD" ]; then
20
+	   libdir="lib64"
21
+          #that's a bit crude...
22
+          PIC_CFLAGS="-fPIC -DPIC"
23
+          want_pic="yes"
24
+        fi
25
       fi
26
     fi
27
   ;;
28
@@ -280,7 +283,6 @@
29
     source_path="`cd \"$source_path\"; pwd`"
30
 fi
31
 # OS specific
32
-targetos=`uname -s`
33
 case $targetos in
34
 BeOS)
35
 js_flags=-DXP_BEOS
36
@@ -1673,7 +1675,7 @@
37
 echo "USE_X11_XV=$has_x11_xv" >> config.mak
38
 fi
39
 
40
-if test "$is_64" = "yes"; then
41
+if test "$is_64" = "yes" -a "$freebsd" = "no" ; then
42
 echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak
43
 else
44
 echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak

Return to bug 131713