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

only do -fPIC on shared architectures where it makes sense.

Browse Source 
unbreaks m88k; ok espie
This commit is contained in:
pvalchev 2004-09-23 07:07:01 +00:00
parent 890234fd51
commit 834098b614
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
converters/libiconv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2003/12/24 00:08:02 brad Exp $
# $OpenBSD: Makefile,v 1.17 2004/09/23 07:07:01 pvalchev Exp $
COMMENT= "character set conversion library"
@ -26,3 +26,7 @@ CONFIGURE_ARGS+= --enable-static \
--mandir=${PREFIX}/man
.include <bsd.port.mk>
.if ${NO_SHARED_LIBS:L} == "no"
CONFIGURE_ENV= LIBTOOL_FLAGS="-fPIC -DPIC"
.endif

8
converters/libiconv/patches/patch-lib_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_Makefile_in,v 1.7 2004/06/13 06:47:32 pvalchev Exp $
$OpenBSD: patch-lib_Makefile_in,v 1.8 2004/09/23 07:07:01 pvalchev Exp $
--- lib/Makefile.in.orig 2003-05-18 08:19:16.000000000 -0600
+++ lib/Makefile.in 2004-06-13 00:31:54.000000000 -0600
@@ -26,7 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=comp
@ -15,15 +15,15 @@ $OpenBSD: patch-lib_Makefile_in,v 1.7 2004/06/13 06:47:32 pvalchev Exp $
iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/iconv.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -fPIC -DPIC -c $(srcdir)/iconv.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LIBTOOL_FLAGS) -c $(srcdir)/iconv.c
localcharset.lo : $(srcdir)/../libcharset/lib/localcharset.c $(srcdir)/relocatable.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/../libcharset/lib/localcharset.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -fPIC -DPIC -c $(srcdir)/../libcharset/lib/localcharset.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LIBTOOL_FLAGS) -c $(srcdir)/../libcharset/lib/localcharset.c
relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -fPIC -DPIC -c $(srcdir)/relocatable.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LIBTOOL_FLAGS) -c $(srcdir)/relocatable.c
# Installs the library and include files only. Typically called with only
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.