Page MenuHomeFreeBSD

D11352.id30129.diff
No OneTemporary

D11352.id30129.diff

Index: devel/ffcall/Makefile
===================================================================
--- devel/ffcall/Makefile
+++ devel/ffcall/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffcall
PORTVERSION= 1.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= GNUSTEP/libs
@@ -20,9 +20,14 @@
GNU_CONFIGURE= yes
USES= gmake libtool
+CONFIGURE_ARGS= --enable-shared
CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
MAKE_JOBS_UNSAFE= yes
CFLAGS+= -fPIC
+
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavcall.so \
+ ${STAGEDIR}${PREFIX}/lib/libcallback.so
.include <bsd.port.mk>
Index: devel/ffcall/pkg-plist
===================================================================
--- devel/ffcall/pkg-plist
+++ devel/ffcall/pkg-plist
@@ -10,7 +10,13 @@
include/vacall.h
include/vacall_r.h
lib/libavcall.a
+lib/libavcall.so
+lib/libavcall.so.0
+lib/libavcall.so.0.0.0
lib/libcallback.a
+lib/libcallback.so
+lib/libcallback.so.0
+lib/libcallback.so.0.0.0
lib/libtrampoline.a
lib/libvacall.a
share/html/avcall.html
Index: lang/qscheme/Makefile
===================================================================
--- lang/qscheme/Makefile
+++ lang/qscheme/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qscheme
PORTVERSION= 0.5.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= lang scheme
MASTER_SITES= http://www.sof.ch/dan/qscheme/files/
@@ -12,33 +12,20 @@
LICENSE= GPLv2
-BUILD_DEPENDS= ${LOCALBASE}/lib/libavcall.a:devel/ffcall \
- ${LOCALBASE}/lib/libpcre.a:devel/pcre \
- ${LOCALBASE}/lib/libgmp.a:math/gmp
-LIB_DEPENDS= libgetline.so:devel/libgetline
+LIB_DEPENDS= libavcall.so:devel/ffcall \
+ libgmp.so:math/gmp \
+ libpcre.so:devel/pcre
-USES= gmake perl5 shebangfix
+USES= gmake localbase perl5 shebangfix
USE_PERL5= build
SHEBANG_FILES= mkoptable
-USE_GCC= any
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-pcre-dir=${LOCALBASE}/lib \
- --with-pcre-inc=${LOCALBASE}/include \
- --with-avcall-dir=${LOCALBASE}/lib \
- --with-avcall-inc=${LOCALBASE}/include \
- --with-gmp-dir=${LOCALBASE}/lib \
- --with-gmp-inc=${LOCALBASE}/include
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lgetline
+CFLAGS+= -fPIC
+MAKE_ARGS= PCRE_LIB="-L${LOCALBASE}/lib -lpcre"
PLIST_SUB= VERSION="${PORTVERSION}"
PORTDOCS= *
-
-# because it uses static pcre lib, which is compiled without -fPIC.
-# pcre problem likely.
-BROKEN_amd64= Does not build on ${ARCH}
-BROKEN_sparc64= Does not build on ${ARCH}
OPTIONS_DEFINE= DOCS
Index: lang/qscheme/files/patch-asm.c
===================================================================
--- /dev/null
+++ lang/qscheme/files/patch-asm.c
@@ -0,0 +1,29 @@
+Fix build with clang
+
+asm.c:1343:21: error: function definition is not allowed here
+ SOBJ prim(char *x) {
+ ^
+--- asm.c.orig 2017-06-24 19:10:34 UTC
++++ asm.c
+@@ -1334,16 +1334,17 @@ static SOBJ scm_compile_quote(SOBJ icode, SOBJ argl, S
+ return(icode);
+ }
+
++static SOBJ prim(char *x) {
++ int dummy;
++ return(SCM_SYM_VALUE(lookup_atom(scm_mkatom(x),NULL,&dummy,FALSE)));
++}
++
+ /*-- KKK: should try to compile parial constant list */
+ SOBJ backquotify(SOBJ ic, SOBJ l, SOBJ env, int level)
+ {
+ static SOBJ sym_cons, sym_append, sym_list2, sym_list2vec;
+
+ if (sym_cons == NULL) {
+- SOBJ prim(char *x) {
+- int dummy;
+- return(SCM_SYM_VALUE(lookup_atom(scm_mkatom(x),NULL,&dummy,FALSE)));
+- }
+ sym_cons = prim("cons");
+ sym_list2 = prim("list2");
+ sym_append = prim("qq-append2");

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 26, 7:24 AM (10 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35519639
Default Alt Text
D11352.id30129.diff (3 KB)

Event Timeline