Our libtool is more strict, and can not find static lib objects when
renamed. Only affects powerpc (rs6000) object rules. Bump for good
measure. trampoline.c didn't change, was just regenerated.
compile tested on powerpc, clisp build is on its way.
ok?
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/devel/ffcall/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 18 Jun 2015 06:05:00 -0000 1.26
+++ Makefile 30 Jul 2015 13:19:04 -0000
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= alpha amd64 hppa i386 mi
COMMENT= foreign function call libraries
DISTNAME= ffcall-1.10
-REVISION = 2
+REVISION = 3
SHARED_LIBS= avcall 1.0 \
callback 1.0
CATEGORIES= devel
Index: patches/patch-avcall_Makefile_in
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/devel/ffcall/patches/patch-avcall_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-avcall_Makefile_in
--- patches/patch-avcall_Makefile_in 23 Aug 2010 14:16:09 -0000 1.5
+++ patches/patch-avcall_Makefile_in 30 Jul 2015 13:19:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-avcall_Makefile_in,v 1.5 2010/08/23 14:16:09 jasper Exp $
---- avcall/Makefile.in.orig Sun Jan 25 09:34:21 2004
-+++ avcall/Makefile.in Sat Apr 25 21:42:02 2009
-@@ -120,7 +120,7 @@ avcall-rs6000.lo : $(srcdir)/avcall-rs6000-aix.old.s $
+--- avcall/Makefile.in.orig Sun Jan 25 18:34:21 2004
++++ avcall/Makefile.in Thu Jul 30 14:59:25 2015
+@@ -120,13 +120,11 @@ avcall-rs6000.lo : $(srcdir)/avcall-rs6000-aix.old.s $
case "$(OS)" in \
aix3*) syntax=aix.old;; \
aix*) syntax=aix.new;; \
@@ -10,3 +10,10 @@ $OpenBSD: patch-avcall_Makefile_in,v 1.5
macos* | darwin*) syntax=macos;; \
*) syntax=sysv4;; \
esac; \
+- $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/avcall-rs6000-$${syntax}.s ; \
+- cp avcall-rs6000-$${syntax}.lo avcall-rs6000.lo ; rm -f
avcall-rs6000-$${syntax}.lo ; \
+- if test -f avcall-rs6000-$${syntax}.o; then mv
avcall-rs6000-$${syntax}.o avcall-rs6000.o; fi
++ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/avcall-rs6000-$${syntax}.s -o avcall-rs6000.lo
+
+ avcall-m88k.lo : $(srcdir)/avcall-m88k.s
+ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-m88k.s
Index: patches/patch-callback_trampoline_r_Makefile_in
===================================================================
RCS file: patches/patch-callback_trampoline_r_Makefile_in
diff -N patches/patch-callback_trampoline_r_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-callback_trampoline_r_Makefile_in 30 Jul 2015 13:19:04
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- callback/trampoline_r/Makefile.in.orig Thu Jul 30 15:10:21 2015
++++ callback/trampoline_r/Makefile.in Thu Jul 30 15:11:45 2015
+@@ -101,7 +101,8 @@ cache-rs6000.lo : $(srcdir)/cache-rs6000-sysv4.s $(src
+ macos* | darwin*) syntax=macos;; \
+ *) syntax=sysv4;; \
+ esac; \
+- $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/cache-rs6000-$${syntax}.s ; mv -f cache-rs6000-$${syntax}.o
cache-rs6000.o ; mv -f cache-rs6000-$${syntax}.lo cache-rs6000.lo
++ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/cache-rs6000-$${syntax}.s \
++ -o cache-rs6000.lo
+
+ cache-convex.lo : $(srcdir)/cache-convex.s
+ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
Index: patches/patch-callback_trampoline_r_trampoline_c
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/devel/ffcall/patches/patch-callback_trampoline_r_trampoline_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-callback_trampoline_r_trampoline_c
--- patches/patch-callback_trampoline_r_trampoline_c 23 Sep 2010 13:38:33
-0000 1.3
+++ patches/patch-callback_trampoline_r_trampoline_c 30 Jul 2015 13:19:04
-0000
@@ -7,8 +7,8 @@ stack instead.
Also fix powerpc and mips64.
---- callback/trampoline_r/trampoline.c.orig Mon Jan 26 07:00:05 2004
-+++ callback/trampoline_r/trampoline.c Fri Jul 30 14:34:10 2010
+--- callback/trampoline_r/trampoline.c.orig Mon Jan 26 16:00:05 2004
++++ callback/trampoline_r/trampoline.c Thu Jul 30 13:51:51 2015
@@ -21,7 +21,7 @@
#endif
#endif
@@ -18,7 +18,7 @@ Also fix powerpc and mips64.
#define __rs6000netbsd__
#else
#if !defined(_AIX)
-@@ -196,8 +196,12 @@ extern RETGETPAGESIZETYPE getpagesize ();
+@@ -196,12 +196,16 @@ extern RETGETPAGESIZETYPE getpagesize ();
#ifdef linux
#include <asm/cachectl.h>
#else
@@ -27,11 +27,15 @@ Also fix powerpc and mips64.
+#else
#ifdef HAVE_SYS_CACHECTL_H
#include <sys/cachectl.h>
-+#endif
#endif
#endif
#endif
-@@ -259,11 +259,11 @@ extern void __TR_clear_cache();
+ #endif
++#endif
+ #ifdef __m88k__
+ #include <sys/syslocal.h>
+ #endif
+@@ -259,11 +263,11 @@ extern void __TR_clear_cache();
#define TRAMP_ALIGN 8
#endif
#if defined(__sparc__) && !defined(__sparc64__)
@@ -45,7 +49,7 @@ Also fix powerpc and mips64.
#define TRAMP_ALIGN 16
#endif
#ifdef __alpha__
-@@ -614,52 +614,64 @@ __TR_function alloc_trampoline_r (address, data0, data
+@@ -614,52 +618,64 @@ __TR_function alloc_trampoline_r (address, data0, data
/* function:
* sethi %hi(<data>),%g2 05000000 | (<data> >> 10)
* sethi %hi(<address>),%g1 03000000 | (<address> >> 10)
Index: patches/patch-callback_vacall_r_Makefile_in
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/devel/ffcall/patches/patch-callback_vacall_r_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-callback_vacall_r_Makefile_in
--- patches/patch-callback_vacall_r_Makefile_in 23 Aug 2010 14:16:09 -0000
1.3
+++ patches/patch-callback_vacall_r_Makefile_in 30 Jul 2015 13:19:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-callback_vacall_r_Makefile_in,v 1.3 2010/08/23 14:16:09 jasper
Exp $
---- callback/vacall_r/Makefile.in.orig Sun Jan 25 06:17:01 2004
-+++ callback/vacall_r/Makefile.in Sat Apr 25 21:44:58 2009
-@@ -120,7 +120,7 @@ vacall-rs6000.lo : $(srcdir)/vacall-rs6000-aix.old.s $
+--- callback/vacall_r/Makefile.in.orig Sun Jan 25 15:17:01 2004
++++ callback/vacall_r/Makefile.in Thu Jul 30 15:07:56 2015
+@@ -120,13 +120,11 @@ vacall-rs6000.lo : $(srcdir)/vacall-rs6000-aix.old.s $
case "$(OS)" in \
aix3*) syntax=aix.old;; \
aix*) syntax=aix.new;; \
@@ -10,3 +10,10 @@ $OpenBSD: patch-callback_vacall_r_Makefi
macos* | darwin*) syntax=macos;; \
*) syntax=sysv4;; \
esac; \
+- $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/vacall-rs6000-$${syntax}.s ; \
+- cp vacall-rs6000-$${syntax}.lo vacall-rs6000.lo ; rm -f
vacall-rs6000-$${syntax}.lo ; \
+- if test -f vacall-rs6000-$${syntax}.o; then mv
vacall-rs6000-$${syntax}.o vacall-rs6000.o; fi
++ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c
$(srcdir)/vacall-rs6000-$${syntax}.s -o vacall-rs6000.lo
+
+ vacall-m88k.lo : $(srcdir)/vacall-m88k.s
+ $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
