diff options
| author | marcus <marcus@FreeBSD.org> | 2003-11-23 18:13:58 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-11-23 18:13:58 +0000 |
| commit | 61179f1ac6d00a0c20f9533d1ce44bce9c2c1ac6 (patch) | |
| tree | 8fd418f7a7bc13384a9e55f06943a9cc748e996b | |
| parent | c2adc4221780efaefbafea525b2dbef77f99f4a5 (diff) | |
| download | FreeBSD-ports-61179f1ac6d00a0c20f9533d1ce44bce9c2c1ac6.zip FreeBSD-ports-61179f1ac6d00a0c20f9533d1ce44bce9c2c1ac6.tar.gz | |
Fix plist on ia64 and amd64, and fix build on amd64.
Approved by: portmgr (implicit)
| -rw-r--r-- | lang/guile/Makefile | 8 | ||||
| -rw-r--r-- | lang/guile/files/patch-libguile_gc_os_dep.c | 27 | ||||
| -rw-r--r-- | lang/guile/pkg-plist | 8 |
3 files changed, 34 insertions, 9 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 0944746..5964887 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -22,7 +22,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_GNOME= gnometarget -CONFIGURE_ARGS= --with-threads CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -40,6 +39,13 @@ INFO= goops guile-tut guile r5rs EXTRA_PATCHES= ${FILESDIR}/extra-patch-ia64 .endif +.if ${ARCH} != "ia64" && ${ARCH} != "amd64" +CONFIGURE_ARGS+=--with-threads +PLIST_SUB+= THREADS:="" +.else +PLIST_SUB+= THREADS:="@comment " +.endif + post-extract: cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES} @${FIND} ${WRKSRC}/doc -name "*.info*" -delete diff --git a/lang/guile/files/patch-libguile_gc_os_dep.c b/lang/guile/files/patch-libguile_gc_os_dep.c index aed1efe..ae62e88 100644 --- a/lang/guile/files/patch-libguile_gc_os_dep.c +++ b/lang/guile/files/patch-libguile_gc_os_dep.c @@ -1,5 +1,5 @@ ---- libguile/gc_os_dep.c.orig Mon Oct 20 01:22:19 2003 -+++ libguile/gc_os_dep.c Mon Oct 20 01:22:03 2003 +--- libguile/gc_os_dep.c.orig Wed Apr 16 16:16:21 2003 ++++ libguile/gc_os_dep.c Sun Nov 23 13:09:53 2003 @@ -93,6 +93,14 @@ # define OPENBSD # define mach_type_known @@ -15,7 +15,7 @@ # if defined(__NetBSD__) && defined(__powerpc__) # define POWERPC # define NETBSD -@@ -225,7 +233,16 @@ +@@ -225,7 +233,21 @@ # define ARM32 # define mach_type_known # endif @@ -25,6 +25,11 @@ +# define IA64 +# define mach_type_known +# endif ++# if defined(__FreeBSD__) && defined(__amd64__) ++# define FREEBSD ++# define AMD64 ++# define mach_type_known ++# endif +# if defined(__FreeBSD__) && defined(__alpha__) +# define FREEBSD +# define ALPHA @@ -33,7 +38,21 @@ # define ALPHA # if !defined(LINUX) # define OSF1 /* a.k.a Digital Unix */ -@@ -1468,7 +1485,7 @@ +@@ -1125,6 +1147,13 @@ + # endif + # endif + ++# ifdef AMD64 ++# define MACH_TYPE "AMD64" ++# define ALIGN_DOUBLE ++# define ALIGNMENT 8 ++# define USE_GENERIC_PUSH_REGS ++# endif ++ + # ifdef IA64 + # define MACH_TYPE "IA64" + # define ALIGN_DOUBLE +@@ -1468,7 +1497,7 @@ # include <setjmp.h> #endif diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist index f4a48ad..7a847dd 100644 --- a/lang/guile/pkg-plist +++ b/lang/guile/pkg-plist @@ -119,10 +119,10 @@ lib/libguilereadline-v-12.a lib/libguilereadline-v-12.la lib/libguilereadline-v-12.so lib/libguilereadline-v-12.so.15 -lib/libqthreads.a -lib/libqthreads.la -lib/libqthreads.so -lib/libqthreads.so.15 +%%THREADS:%%lib/libqthreads.a +%%THREADS:%%lib/libqthreads.la +%%THREADS:%%lib/libqthreads.so +%%THREADS:%%lib/libqthreads.so.15 share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let*.scm |
