From 6fcade56c30e8cde23c15a1877f94ad0ecde2387 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 6 Jan 2019 10:36:38 +0000 Subject: [PATCH] Don't patch out -Wl,-soname... Ptlib and friends use their own build system and getting rid of the libfoo.so -> libfoo.so.X.Y symlink would be a nightmare to maintain. So soname is mandatory. --- devel/ptlib/Makefile | 10 ++++---- devel/ptlib/patches/patch-configure | 21 ++++++++--------- devel/ptlib/patches/patch-make_unix_mak | 31 +++++++++++-------------- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 1cc03f4ec70..c9a0c490d8d 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.44 2019/01/06 10:36:38 ajacoutot Exp $ COMMENT= portable tools library @@ -6,7 +6,7 @@ V= 2.12.9 DISTNAME= ptlib-${V} EXTRACT_SUFX= .tar.bz2 SUBST_VARS= V -REVISION= 13 +REVISION= 14 SHARED_LIBS= pt 7.0 @@ -19,10 +19,10 @@ MAINTAINER= Antoine Jacoutot # MPL 1.0 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += SDL c crypto expat lber ldap ldap_r m pthread sasl2 -WANTLIB += sndio ssl ${COMPILER_LIBCXX} v4l2 +WANTLIB += ${COMPILER_LIBCXX} SDL c crypto expat lber-2.4 ldap-2.4 +WANTLIB += ldap_r-2.4 m sasl2 sndio ssl v4l2 -COMPILER = base-clang ports-gcc base-gcc +COMPILER= base-clang ports-gcc base-gcc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/} diff --git a/devel/ptlib/patches/patch-configure b/devel/ptlib/patches/patch-configure index aa570be72a1..4c1747467d9 100644 --- a/devel/ptlib/patches/patch-configure +++ b/devel/ptlib/patches/patch-configure @@ -1,9 +1,10 @@ -$OpenBSD: patch-configure,v 1.2 2016/01/01 17:30:33 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.3 2019/01/06 10:36:38 ajacoutot Exp $ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ ---- configure.orig Mon Feb 17 03:14:21 2014 -+++ configure Fri Jan 1 17:33:02 2016 +Index: configure +--- configure.orig ++++ configure @@ -640,6 +640,7 @@ HAS_V4L HAS_AUDIOSHM HAS_SUNAUDIO @@ -28,17 +29,15 @@ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ --disable-pulse disable Pulse audio support --disable-sunaudio disable Sun audio support --disable-shmaudio disable shm audio support -@@ -5225,7 +5228,8 @@ case "$target_os" in +@@ -5225,7 +5228,6 @@ case "$target_os" in OpenBSD ) OS_TAG="P_OPENBSD" - ENDLDLIBS="-lossaudio" -+ ENDLDLIBS="" -+ LDSOFLAGS="-shared" need_pragma=yes ;; -@@ -8079,6 +8083,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ +@@ -8079,6 +8081,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ $as_echo_n "checking if works... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46,7 +45,7 @@ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ #include int main () -@@ -12185,7 +12190,7 @@ $as_echo "no" >&6; } +@@ -12185,7 +12188,7 @@ $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } case "$target_os" in @@ -55,7 +54,7 @@ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5 $as_echo_n "checking for dlopen in -lc... " >&6; } if ${ac_cv_lib_c_dlopen+:} false; then : -@@ -12479,6 +12484,32 @@ fi +@@ -12479,6 +12482,32 @@ fi fi @@ -88,7 +87,7 @@ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ # Check whether --enable-pulse was given. if test "${enable_pulse+set}" = set; then : enableval=$enable_pulse; -@@ -12590,7 +12621,7 @@ $as_echo "$as_me: V4L2 video disabled by user" >&6;} +@@ -12590,7 +12619,7 @@ $as_echo "$as_me: V4L2 video disabled by user" >&6;} else case "$target_os" in solaris* | sunos* ) V4L2_HEADER="sys/videodev2.h" ; ;; @@ -97,7 +96,7 @@ Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/ * ) V4L2_HEADER="linux/videodev2.h" ; ;; esac -@@ -14345,6 +14376,7 @@ echo " Audio : ${PTLIB_AUD +@@ -14345,6 +14374,7 @@ echo " Audio : ${PTLIB_AUD echo " ALSA : ${PTLIB_ALSA}" echo " ESD : ${PTLIB_ESD}" echo " OSS : ${PTLIB_OSS}" diff --git a/devel/ptlib/patches/patch-make_unix_mak b/devel/ptlib/patches/patch-make_unix_mak index a823cab9202..68f68ec2f71 100644 --- a/devel/ptlib/patches/patch-make_unix_mak +++ b/devel/ptlib/patches/patch-make_unix_mak @@ -1,35 +1,30 @@ -$OpenBSD: patch-make_unix_mak,v 1.7 2015/05/22 15:16:24 ajacoutot Exp $ +$OpenBSD: patch-make_unix_mak,v 1.8 2019/01/06 10:36:38 ajacoutot Exp $ Make sure _SONAME is versioned (.so.X.Y versus .so). ---- make/unix.mak.orig Mon Feb 17 03:14:37 2014 -+++ make/unix.mak Fri May 22 15:33:37 2015 -@@ -192,8 +192,14 @@ ifeq ($(target_cpu),x86) +Index: make/unix.mak +--- make/unix.mak.orig ++++ make/unix.mak +@@ -192,7 +192,9 @@ ifeq ($(target_cpu),x86) #PTLIB_CFLAGS += -m486 endif -LDLIBS += -lossaudio -+ifeq ($(MACHTYPE),amd64) ++ifeq (,$(findstring $(MACHTYPE),amd64 sparc64)) +STDCCFLAGS += -DP_64BIT +endif -+ifeq ($(MACHTYPE),sparc64) -+STDCCFLAGS += -DP_64BIT -+endif -+ P_USE_RANLIB := 1 #PTLIB_CFLAGS += -DP_USE_PRAGMA # migrated to configure - -@@ -571,6 +577,12 @@ else +@@ -569,6 +571,11 @@ ifeq (,$(findstring $(target_os),Darwin cygwin mingw)) + else + PTLIB_SONAME = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION)$(BUILD_TYPE)$(BUILD_NUMBER).$(LIB_SUFFIX),$(PTLIB_FILE)) PTLIB_DEBUG_SONAME = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION)$(BUILD_TYPE)$(BUILD_NUMBER).$(LIB_SUFFIX),$(PTLIB_DEBUG_FILE)) - endif - ++endif ++ +ifeq ($(target_os),OpenBSD) -+ PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) -+ PTLIB_DEBUG_FILE= lib$(PTLIB_BASE)_d$(LIB_TYPE).$(LIB_SUFFIX) + PTLIB_SONAME = $(PTLIB_FILE).${LIBpt_VERSION} + PTLIB_DEBUG_SONAME = $(PTLIB_DEBUG_FILE).${LIBpt_VERSION} -+endif + endif + - ############################################################################### - #