cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass the pic flag along to the compiler when linking the shared library.

Browse Source
This commit is contained in:
brad 2000-10-18 14:50:55 +00:00
parent 3cc73ec531
commit 892c9e01da
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/gd/patches/patch-Makefile
View File

@ -1,5 +1,5 @@
--- Makefile.orig Sat Jun 3 15:26:12 2000
+++ Makefile Sat Sep 16 06:47:35 2000
+++ Makefile Wed Oct 18 09:30:03 2000
@@ -51,13 +51,13 @@
LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
@ -17,11 +17,12 @@
#
#
@@ -75,26 +75,35 @@
@@ -75,26 +75,36 @@
BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
-all: libgd.a $(PROGRAMS)
+PICFLAG= -fpic
+SHLIB= libgd.so.18.3
+.if defined(NO_SHARED_LIB) && ${NO_SHARED_LIB:L} == "yes"
@ -71,7 +72,7 @@
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
@@ -129,17 +138,21 @@
@@ -129,17 +139,21 @@
gdtestttf: gdtestttf.o libgd.a
$(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
@ -95,11 +96,11 @@
+ $(AR) rc libgd.a $(OBJS)
+$(SHLIB): $(SHOBJS)
+ $(CC) -shared -o $(SHLIB) $(SHOBJS)
+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHOBJS)
+
clean:
- rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
+ rm -f *.o *.so ${PROGRAMS} libgd.a $(SHLIB) test/gdtest.jpg test/gdtest.wbmp
+.c.so:
+ $(CC) $(CFLAGS) -fpic -DPIC -c $? -o $@
+ $(CC) $(CFLAGS) $(PICFLAG) -DPIC -c $? -o $@

14
textproc/expat/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig Mon Mar 8 08:20:38 1999
+++ Makefile Wed Sep 27 10:23:50 2000
@@ -10,21 +10,26 @@
+++ Makefile Wed Oct 18 09:47:00 2000
@@ -10,21 +10,28 @@
#FILEMAP_OBJ=xmlwf/readfilemap.o
OBJS=xmltok/xmltok.o \
xmltok/xmlrole.o \
@ -17,7 +17,8 @@
EXE=
-all: xmlwf/xmlwf$(EXE)
-
+PICFLAG= -fpic
-xmlwf/xmlwf$(EXE): $(OBJS)
- $(CC) $(CFLAGS) -o $@ $(OBJS)
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
@ -35,7 +36,7 @@
xmltok/nametab.h: gennmtab/gennmtab$(EXE)
rm -f $@
@@ -35,5 +40,18 @@
@@ -35,5 +42,17 @@
xmltok/xmltok.o: xmltok/nametab.h
@ -44,7 +45,7 @@
+ ranlib $@
+
+$(SHLIB): $(SHOBJS)
+ $(CC) -shared -o $(SHLIB) $(SHOBJS)
+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHOBJS)
+
+.SUFFIXES: .o .so
+
@ -52,5 +53,4 @@
$(CC) $(CFLAGS) -c -o $@ $<
+
+.c.so:
+ $(CC) $(CFLAGS) -fpic -DPIC -c -o $@ $<
+
+ $(CC) $(CFLAGS) $(PICFLAG) -DPIC -c -o $@ $<