From f2f970a91cbf90d8340489196ee3f41fab77081c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 27 Mar 2010 14:32:23 +0000 Subject: [PATCH] Put '-fPIC' in openbsd ifdefs. --- devel/ptlib/Makefile | 4 ++-- devel/ptlib/patches/patch-make_lib_mak | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index eb3eebac246..fa61300f1a3 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2010/03/26 14:24:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2010/03/27 14:32:23 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= portable tools library DISTNAME= ptlib-2.6.5 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 SHARED_LIBS= pt 3.0 # 2.4.2 diff --git a/devel/ptlib/patches/patch-make_lib_mak b/devel/ptlib/patches/patch-make_lib_mak index 2910d1719b2..8d7d528fc76 100644 --- a/devel/ptlib/patches/patch-make_lib_mak +++ b/devel/ptlib/patches/patch-make_lib_mak @@ -1,6 +1,6 @@ -$OpenBSD: patch-make_lib_mak,v 1.2 2010/03/26 14:24:42 ajacoutot Exp $ +$OpenBSD: patch-make_lib_mak,v 1.3 2010/03/27 14:32:23 ajacoutot Exp $ --- make/lib.mak.orig Mon Sep 21 02:25:30 2009 -+++ make/lib.mak Fri Mar 26 15:18:29 2010 ++++ make/lib.mak Sat Mar 27 15:21:24 2010 @@ -29,10 +29,14 @@ # @@ -19,19 +19,16 @@ $OpenBSD: patch-make_lib_mak,v 1.2 2010/03/26 14:24:42 ajacoutot Exp $ endif else ifeq ($(BUILD_TYPE),.) -@@ -98,10 +102,14 @@ ifeq ($(P_SHAREDLIB),1) +@@ -98,7 +102,11 @@ ifeq ($(P_SHAREDLIB),1) LDSOOPTS += -Wl,--kill-at else ifneq ($(OSTYPE),Darwin) - LDSOOPTS += -Wl,-soname,$(LIB_SONAME) + ifneq ($(OSTYPE),OpenBSD) + LDSOOPTS += -Wl,-soname,$(LIB_SONAME) ++ else ++ LDSOOPTS += -fPIC + endif endif endif endif -+ -+ LDSOOPTS += -fPIC - - $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT) - @cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)