ghostscript-agpl: Use correct linker flags on SunOS.

This commit is contained in:
jperkin 2018-01-25 10:38:57 +00:00
parent df10b41e45
commit 0ef52c72eb
2 changed files with 30 additions and 6 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.18 2017/10/06 06:15:00 adam Exp $
$NetBSD: distinfo,v 1.19 2018/01/25 10:38:57 jperkin Exp $
SHA1 (ghostscript-9.22.tar.gz) = 666d16cb4fd9b22f6bcfa874b30cbfadf7c9d67d
RMD160 (ghostscript-9.22.tar.gz) = ece611db0c38de2e8061560c50cd16265144d50f
@ -8,5 +8,5 @@ SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
SHA1 (patch-base_mkromfs.c) = 96006928e0b5381e7101027372b6e6408f1c4a0b
SHA1 (patch-base_unix-dll.mak) = 23595f424ecd2af4a504f15817fd57cdec8851df
SHA1 (patch-configure) = 50967456938be7061ce081335a3a602726b939a8
SHA1 (patch-configure) = 07a27ec49e9e17e12d13c599fcfdfa8117cc4144
SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09

View file

@ -1,10 +1,10 @@
$NetBSD: patch-configure,v 1.1 2017/03/31 07:26:23 adam Exp $
$NetBSD: patch-configure,v 1.2 2018/01/25 10:38:57 jperkin Exp $
Use system zlib for linking.
Add rpath.
Use correct install_name with path on Darwin.
--- configure.orig 2017-03-16 10:12:44.000000000 +0000
--- configure.orig 2017-10-04 08:54:03.000000000 +0000
+++ configure
@@ -3742,7 +3742,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
@ -15,7 +15,18 @@ Use correct install_name with path on Darwin.
# purposefully do not include "help" output for this
@@ -6705,7 +6705,7 @@ fi
@@ -4356,9 +4356,7 @@ else
SunOS)
CC_OPT_FLAGS_TO_TRY="-O2"
# the trailing space is required!
- if test $ac_cv_c_compiler_gnu = no; then
- SET_DT_SONAME="-h "
- fi
+ SET_DT_SONAME="-h,"
if test $ac_cv_c_compiler_gnu = yes; then
CC_OPT_FLAGS_TO_TRY="-O2"
CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
@@ -6705,7 +6703,7 @@ fi
fi
if test x$with_libpaper != xno; then
@ -24,7 +35,7 @@ Use correct install_name with path on Darwin.
$as_echo "#define USE_LIBPAPER 1" >>confdefs.h
@@ -10047,9 +10047,9 @@ else
@@ -10047,9 +10045,9 @@ else
SO_LIB_EXT=".so"
;;
Darwin*)
@ -37,3 +48,16 @@ Use correct install_name with path on Darwin.
DYNAMIC_LIBS=""
SO_LIB_EXT=".dylib"
;;
@@ -10059,9 +10057,9 @@ else
else
DYNAMIC_CFLAGS="-KPIC"
fi
- GS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
- PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
- XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
+ GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
+ PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
+ XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
DYNAMIC_LIBS=""
SO_LIB_EXT=".so"
;;