[packages/bnlib.git] / bnlib-shared.patch

--- bnlib-1.1.4/Makefile.in.orig	2000-08-03 05:37:09.000000000 +0200
+++ bnlib-1.1.4/Makefile.in	2013-01-31 17:19:03.019425863 +0100
@@ -27,12 +27,18 @@
 LDFLAGS	=@LDFLAGS@
 LIBS=@LIBS@
 RANLIB=@RANLIB@
+top_builddir=@top_builddir@
+LIBTOOL=@LIBTOOL@
+includedir=@includedir@
+libdir=@libdir@
 
 # If you have a machine-specific assembly file, add it to AUXOBJS.
 OBJS	= bn00.o lbn00.o bn.o lbnmem.o sieve.o prime.o \
 	  bnprint.o jacobi.o germain.o $(AUXOBJS)
 
-BNLIB	= libbn.a 
+LTOBJS=$(OBJS:.o=.lo)
+
+BNLIB	= libbn.la
 
 all: $(BNLIB) bntest germtest
 
@@ -40,14 +46,13 @@
 	./bntest
 
 bntest: bntest00.o $(BNLIB)
-	$(LD) $(LDFLAGS) -o $@ bntest00.o $(BNLIB) $(LIBS)
+	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) $(CFLAGS) -o $@ bntest00.o $(BNLIB) $(LIBS)
 
 germtest: germtest.o $(BNLIB)
-	$(LD) $(LDFLAGS) -o $@ germtest.o $(BNLIB) $(LIBS)
+	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) $(CFLAGS) -o $@ germtest.o $(BNLIB) $(LIBS)
 
-$(BNLIB): $(OBJS)
-	$(AR) r $@ $?
-	$(RANLIB) $@
+$(BNLIB): $(LTOBJS)
+	$(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $? -rpath $(libdir)
 
 # Here we get tricky... if we're compiling with GCC, then GCCMAGIC1 and
 # GCCMAGIC2 are set so that we actually do a link, but with the -r flag
@@ -57,21 +62,9 @@
 # has by far the most math in it, will have a call to every interesting
 # support-library function.
 
-lbn00.o: $(srcdir)/lbn00.c $(HDRS) config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn00.c @GCCMAGIC2@
-
-lbn16.o: $(srcdir)/lbn16.c $(HDRS) config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn16.c @GCCMAGIC2@
-
-lbn32.o: $(srcdir)/lbn32.c $(HDRS) config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn32.c @GCCMAGIC2@
-
-lbn64.o: $(srcdir)/lbn64.c $(HDRS) config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn64.c @GCCMAGIC2@
-
 # The default .o rule.
-.c.o: config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ -c $<
+%.lo: %.c config.h
+	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ -c $<
 
 # Extra, non-obvious dependencies.  Bnlib can be compiled in three
 # word sizes, and the *00.c files #include the right .c files based
@@ -79,10 +72,10 @@
 # subset of these files.  Duplicated here in case someone regenerates
 # dependencies with cc -M and they get lost.
 
-lbn00.o: lbn16.c lbn32.c lbn64.c lbn16.h lbn32.h lbn64.h 
-bn00.o: bn16.c bn32.c bn64.c bn16.h bn32.h bn64.h \
+lbn00.lo: lbn16.c lbn32.c lbn64.c lbn16.h lbn32.h lbn64.h 
+bn00.lo: bn16.c bn32.c bn64.c bn16.h bn32.h bn64.h \
   bninit16.c bninit32.c bninit64.c
-bntest00.o: bntest16.c bntest32.c bntest64.c lbn16.h lbn32.h lbn64.h
+bntest00.lo: bntest16.c bntest32.c bntest64.c lbn16.h lbn32.h lbn64.h
 
 # Actual build commented out to prevent confusion by people without autoconf.
 # Do it manually for now.
@@ -90,6 +83,11 @@
 	@echo "configure script is out of date; run autoconf"
 #	autoconf
 
+install:
+	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install install $(BNLIB) $(DESTDIR)$(libdir)
+	install -m644 bn.h $(DESTDIR)$(includedir)
+
 clean:
 	$(RM) -f *.o *32.[ch] *64.[ch]
 
@@ -128,36 +126,36 @@
 	@chmod a-w $@
 
 ### Dependencies
-bn.o: bn.c bn.h
-bn00.o: bn00.c bnsize00.h lbn.h bn16.c bn32.c bn64.c lbn16.c lbn32.h \
+bn.lo: bn.c bn.h
+bn00.lo: bn00.c bnsize00.h lbn.h bn16.c bn32.c bn64.c lbn16.c lbn32.h \
   lbn64.h lbnmem.h bn16.h bn32.h bn64.h bn.h kludge.h bninit16.c \
   bninit32.c bninit64.c
-bn16.o: bn16.c lbn.h lbn16.h lbnmem.h bn16.h bn.h kludge.h
-bn32.o: bn32.c lbn.h lbn32.h lbnmem.h bn32.h bn.h kludge.h
-bn64.o: bn64.c lbn.h lbn64.h lbnmem.h bn64.h bn.h kludge.h
-bn68000.o: bn68000.c lbn.h lbn68000.h bn16.h bn32.h
-bn8086.o: bn8086.c lbn.h bn64.h lbn8086.h bn32.h
-bninit16.o: bninit16.c bn.h bn16.h
-bninit32.o: bninit32.c bn.h bn32.h
-bninit64.o: bninit64.c bn.h bn64.h
-bnprint.o: bnprint.c bn.h bnprint.h kludge.h
-bntest00.o: bntest00.c bnsize00.h lbn.h bntest16.c bntest32.c \
+bn16.lo: bn16.c lbn.h lbn16.h lbnmem.h bn16.h bn.h kludge.h
+bn32.lo: bn32.c lbn.h lbn32.h lbnmem.h bn32.h bn.h kludge.h
+bn64.lo: bn64.c lbn.h lbn64.h lbnmem.h bn64.h bn.h kludge.h
+bn68000.lo: bn68000.c lbn.h lbn68000.h bn16.h bn32.h
+bn8086.lo: bn8086.c lbn.h bn64.h lbn8086.h bn32.h
+bninit16.lo: bninit16.c bn.h bn16.h
+bninit32.lo: bninit32.c bn.h bn32.h
+bninit64.lo: bninit64.c bn.h bn64.h
+bnprint.lo: bnprint.c bn.h bnprint.h kludge.h
+bntest00.lo: bntest00.c bnsize00.h lbn.h bntest16.c bntest32.c \
   bntest64.c cputime.h lbn16.h lbn32.h lbn64.h kludge.h
-bntest16.o: bntest16.c cputime.h lbn16.h lbn.h kludge.h
-bntest32.o: bntest32.c cputime.h lbn32.h lbn.h kludge.h
-bntest64.o: bntest64.c cputime.h lbn64.h lbn.h kludge.h
-germain.o: germain.c bn.h germain.h jacobi.h lbnmem.h sieve.h kludge.h
-germtest.o: germtest.c bn.h germain.h sieve.h cputime.h bnprint.h
-jacobi.o: jacobi.c bn.h jacobi.h
-lbn00.o: lbn00.c bnsize00.h lbn.h lbn16.c lbn16.h lbn32.c lbn32.h \
+bntest16.lo: bntest16.c cputime.h lbn16.h lbn.h kludge.h
+bntest32.lo: bntest32.c cputime.h lbn32.h lbn.h kludge.h
+bntest64.lo: bntest64.c cputime.h lbn64.h lbn.h kludge.h
+germain.lo: germain.c bn.h germain.h jacobi.h lbnmem.h sieve.h kludge.h
+germtest.lo: germtest.c bn.h germain.h sieve.h cputime.h bnprint.h
+jacobi.lo: jacobi.c bn.h jacobi.h
+lbn00.lo: lbn00.c bnsize00.h lbn.h lbn16.c lbn16.h lbn32.c lbn32.h \
   lbn64.c lbn64.h lbnmem.h kludge.h
-lbn16.o: lbn16.c lbn.h lbn16.h lbnmem.h kludge.h
-lbn32.o: lbn32.c lbn.h lbn32.h lbnmem.h kludge.h
-lbn64.o: lbn64.c lbn.h lbn64.h lbnmem.h kludge.h
-lbn68000.o: lbn68000.c lbn.h lbn68000.h
-lbn68020.o: lbn68020.c lbn.h lbn68020.h
-lbnmem.o: lbnmem.c lbn.h lbnmem.h kludge.h
-lbnppc.o: lbnppc.c lbnppc.h ppcasm.h
-prime.o: prime.c bn.h lbnmem.h prime.h sieve.h kludge.h
-sieve.o: sieve.c bn.h sieve.h kludge.h
+lbn16.lo: lbn16.c lbn.h lbn16.h lbnmem.h kludge.h
+lbn32.lo: lbn32.c lbn.h lbn32.h lbnmem.h kludge.h
+lbn64.lo: lbn64.c lbn.h lbn64.h lbnmem.h kludge.h
+lbn68000.lo: lbn68000.c lbn.h lbn68000.h
+lbn68020.lo: lbn68020.c lbn.h lbn68020.h
+lbnmem.lo: lbnmem.c lbn.h lbnmem.h kludge.h
+lbnppc.lo: lbnppc.c lbnppc.h ppcasm.h
+prime.lo: prime.c bn.h lbnmem.h prime.h sieve.h kludge.h
+sieve.lo: sieve.c bn.h sieve.h kludge.h
 sizetest.c: bnsize00.h
--- bnlib-1.1.4/configure.in.orig	2013-01-31 16:00:34.612857334 +0100
+++ bnlib-1.1.4/configure.in	2013-01-31 16:22:09.572830343 +0100
@@ -198,7 +198,7 @@
 
 # Find "ranlib".  Sone systems don't have or need ranlib.  If so,
 # ":" (do nothing) is used instead.
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
 dnl (we don't have any)
Commit	Line	Data
cc2f71ef JB	1	--- bnlib-1.1.4/Makefile.in.orig 2000-08-03 05:37:09.000000000 +0200
	2	+++ bnlib-1.1.4/Makefile.in 2013-01-31 17:19:03.019425863 +0100
	3	@@ -27,12 +27,18 @@
	4	LDFLAGS =@LDFLAGS@
	5	LIBS=@LIBS@
	6	RANLIB=@RANLIB@
	7	+top_builddir=@top_builddir@
	8	+LIBTOOL=@LIBTOOL@
	9	+includedir=@includedir@
	10	+libdir=@libdir@
	11
	12	# If you have a machine-specific assembly file, add it to AUXOBJS.
	13	OBJS = bn00.o lbn00.o bn.o lbnmem.o sieve.o prime.o \
	14	bnprint.o jacobi.o germain.o $(AUXOBJS)
	15
	16	-BNLIB = libbn.a
	17	+LTOBJS=$(OBJS:.o=.lo)
	18	+
	19	+BNLIB = libbn.la
	20
	21	all: $(BNLIB) bntest germtest
	22
	23	@@ -40,14 +46,13 @@
	24	./bntest
	25
	26	bntest: bntest00.o $(BNLIB)
	27	- $(LD) $(LDFLAGS) -o $@ bntest00.o $(BNLIB) $(LIBS)
	28	+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) $(CFLAGS) -o $@ bntest00.o $(BNLIB) $(LIBS)
	29
	30	germtest: germtest.o $(BNLIB)
	31	- $(LD) $(LDFLAGS) -o $@ germtest.o $(BNLIB) $(LIBS)
	32	+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) $(CFLAGS) -o $@ germtest.o $(BNLIB) $(LIBS)
	33
	34	-$(BNLIB): $(OBJS)
	35	- $(AR) r $@ $?
	36	- $(RANLIB) $@
	37	+$(BNLIB): $(LTOBJS)
	38	+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $? -rpath $(libdir)
	39
	40	# Here we get tricky... if we're compiling with GCC, then GCCMAGIC1 and
	41	# GCCMAGIC2 are set so that we actually do a link, but with the -r flag
	42	@@ -57,21 +62,9 @@
	43	# has by far the most math in it, will have a call to every interesting
	44	# support-library function.
	45
	46	-lbn00.o: $(srcdir)/lbn00.c $(HDRS) config.h
	47	- $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn00.c @GCCMAGIC2@
	48	-
	49	-lbn16.o: $(srcdir)/lbn16.c $(HDRS) config.h
	50	- $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn16.c @GCCMAGIC2@
	51	-
	52	-lbn32.o: $(srcdir)/lbn32.c $(HDRS) config.h
	53	- $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn32.c @GCCMAGIC2@
	54	-
	55	-lbn64.o: $(srcdir)/lbn64.c $(HDRS) config.h
	56	- $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ lbn64.c @GCCMAGIC2@
	57	-
	58	# The default .o rule.
	59	-.c.o: config.h
	60	- $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ -c $<
	61	+%.lo: %.c config.h
	62	+ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ -c $<
	63
	64	# Extra, non-obvious dependencies. Bnlib can be compiled in three
65	# word sizes, and the *00.c files #include the right .c files based
66	@@ -79,10 +72,10 @@
67	# subset of these files. Duplicated here in case someone regenerates
68	# dependencies with cc -M and they get lost.
69
70	-lbn00.o: lbn16.c lbn32.c lbn64.c lbn16.h lbn32.h lbn64.h
71	-bn00.o: bn16.c bn32.c bn64.c bn16.h bn32.h bn64.h \
72	+lbn00.lo: lbn16.c lbn32.c lbn64.c lbn16.h lbn32.h lbn64.h
73	+bn00.lo: bn16.c bn32.c bn64.c bn16.h bn32.h bn64.h \
74	bninit16.c bninit32.c bninit64.c
75	-bntest00.o: bntest16.c bntest32.c bntest64.c lbn16.h lbn32.h lbn64.h
76	+bntest00.lo: bntest16.c bntest32.c bntest64.c lbn16.h lbn32.h lbn64.h
77
78	# Actual build commented out to prevent confusion by people without autoconf.
79	# Do it manually for now.
80	@@ -90,6 +83,11 @@
81	@echo "configure script is out of date; run autoconf"
82	# autoconf
83
84	+install:
85	+ install -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
86	+ $(LIBTOOL) --mode=install install $(BNLIB) $(DESTDIR)$(libdir)
87	+ install -m644 bn.h $(DESTDIR)$(includedir)
88	+
89	clean:
90	$(RM) -f .o 32.[ch] *64.[ch]
91
92	@@ -128,36 +126,36 @@
93	@chmod a-w $@
94
95	### Dependencies
96	-bn.o: bn.c bn.h
97	-bn00.o: bn00.c bnsize00.h lbn.h bn16.c bn32.c bn64.c lbn16.c lbn32.h \
98	+bn.lo: bn.c bn.h
99	+bn00.lo: bn00.c bnsize00.h lbn.h bn16.c bn32.c bn64.c lbn16.c lbn32.h \
100	lbn64.h lbnmem.h bn16.h bn32.h bn64.h bn.h kludge.h bninit16.c \
101	bninit32.c bninit64.c
102	-bn16.o: bn16.c lbn.h lbn16.h lbnmem.h bn16.h bn.h kludge.h
103	-bn32.o: bn32.c lbn.h lbn32.h lbnmem.h bn32.h bn.h kludge.h
104	-bn64.o: bn64.c lbn.h lbn64.h lbnmem.h bn64.h bn.h kludge.h
105	-bn68000.o: bn68000.c lbn.h lbn68000.h bn16.h bn32.h
106	-bn8086.o: bn8086.c lbn.h bn64.h lbn8086.h bn32.h
107	-bninit16.o: bninit16.c bn.h bn16.h
108	-bninit32.o: bninit32.c bn.h bn32.h
109	-bninit64.o: bninit64.c bn.h bn64.h
110	-bnprint.o: bnprint.c bn.h bnprint.h kludge.h
111	-bntest00.o: bntest00.c bnsize00.h lbn.h bntest16.c bntest32.c \
112	+bn16.lo: bn16.c lbn.h lbn16.h lbnmem.h bn16.h bn.h kludge.h
113	+bn32.lo: bn32.c lbn.h lbn32.h lbnmem.h bn32.h bn.h kludge.h
114	+bn64.lo: bn64.c lbn.h lbn64.h lbnmem.h bn64.h bn.h kludge.h
115	+bn68000.lo: bn68000.c lbn.h lbn68000.h bn16.h bn32.h
116	+bn8086.lo: bn8086.c lbn.h bn64.h lbn8086.h bn32.h
117	+bninit16.lo: bninit16.c bn.h bn16.h
118	+bninit32.lo: bninit32.c bn.h bn32.h
119	+bninit64.lo: bninit64.c bn.h bn64.h
120	+bnprint.lo: bnprint.c bn.h bnprint.h kludge.h
121	+bntest00.lo: bntest00.c bnsize00.h lbn.h bntest16.c bntest32.c \
122	bntest64.c cputime.h lbn16.h lbn32.h lbn64.h kludge.h
123	-bntest16.o: bntest16.c cputime.h lbn16.h lbn.h kludge.h
124	-bntest32.o: bntest32.c cputime.h lbn32.h lbn.h kludge.h
125	-bntest64.o: bntest64.c cputime.h lbn64.h lbn.h kludge.h
126	-germain.o: germain.c bn.h germain.h jacobi.h lbnmem.h sieve.h kludge.h
127	-germtest.o: germtest.c bn.h germain.h sieve.h cputime.h bnprint.h
128	-jacobi.o: jacobi.c bn.h jacobi.h
129	-lbn00.o: lbn00.c bnsize00.h lbn.h lbn16.c lbn16.h lbn32.c lbn32.h \
130	+bntest16.lo: bntest16.c cputime.h lbn16.h lbn.h kludge.h
131	+bntest32.lo: bntest32.c cputime.h lbn32.h lbn.h kludge.h
132	+bntest64.lo: bntest64.c cputime.h lbn64.h lbn.h kludge.h
133	+germain.lo: germain.c bn.h germain.h jacobi.h lbnmem.h sieve.h kludge.h
134	+germtest.lo: germtest.c bn.h germain.h sieve.h cputime.h bnprint.h
135	+jacobi.lo: jacobi.c bn.h jacobi.h
136	+lbn00.lo: lbn00.c bnsize00.h lbn.h lbn16.c lbn16.h lbn32.c lbn32.h \
137	lbn64.c lbn64.h lbnmem.h kludge.h
138	-lbn16.o: lbn16.c lbn.h lbn16.h lbnmem.h kludge.h
139	-lbn32.o: lbn32.c lbn.h lbn32.h lbnmem.h kludge.h
140	-lbn64.o: lbn64.c lbn.h lbn64.h lbnmem.h kludge.h
141	-lbn68000.o: lbn68000.c lbn.h lbn68000.h
142	-lbn68020.o: lbn68020.c lbn.h lbn68020.h
143	-lbnmem.o: lbnmem.c lbn.h lbnmem.h kludge.h
144	-lbnppc.o: lbnppc.c lbnppc.h ppcasm.h
145	-prime.o: prime.c bn.h lbnmem.h prime.h sieve.h kludge.h
146	-sieve.o: sieve.c bn.h sieve.h kludge.h
147	+lbn16.lo: lbn16.c lbn.h lbn16.h lbnmem.h kludge.h
148	+lbn32.lo: lbn32.c lbn.h lbn32.h lbnmem.h kludge.h
149	+lbn64.lo: lbn64.c lbn.h lbn64.h lbnmem.h kludge.h
150	+lbn68000.lo: lbn68000.c lbn.h lbn68000.h
151	+lbn68020.lo: lbn68020.c lbn.h lbn68020.h
152	+lbnmem.lo: lbnmem.c lbn.h lbnmem.h kludge.h
153	+lbnppc.lo: lbnppc.c lbnppc.h ppcasm.h
154	+prime.lo: prime.c bn.h lbnmem.h prime.h sieve.h kludge.h
155	+sieve.lo: sieve.c bn.h sieve.h kludge.h
156	sizetest.c: bnsize00.h
157	--- bnlib-1.1.4/configure.in.orig 2013-01-31 16:00:34.612857334 +0100
158	+++ bnlib-1.1.4/configure.in 2013-01-31 16:22:09.572830343 +0100
159	@@ -198,7 +198,7 @@
160
161	# Find "ranlib". Sone systems don't have or need ranlib. If so,
162	# ":" (do nothing) is used instead.
163	-AC_PROG_RANLIB
164	+AC_PROG_LIBTOOL
165
166	dnl Checks for libraries.
167	dnl (we don't have any)