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

remove shared lib inter-library dependency on libm and libcurses

Browse Source
This commit is contained in:
brad 2004-01-11 07:05:31 +00:00
parent 2b937d60d5
commit c51aeee32a
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/libslang/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.36 2003/08/13 23:41:02 naddy Exp $ # $OpenBSD: Makefile,v 1.37 2004/01/11 07:05:31 brad Exp $
COMMENT= "stack-based interpreter for terminal applications" COMMENT= "stack-based interpreter for terminal applications"
VERSION= 1.4.9 VERSION= 1.4.9
DISTNAME= slang-${VERSION} DISTNAME= slang-${VERSION}
PKGNAME= libslang-${VERSION} PKGNAME= libslang-${VERSION}p1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ http://gd.tuwien.ac.at/editors/davis/slang/v1.4/

30
devel/libslang/patches/patch-autoconf_aclocal_m4
View File

@ -1,20 +1,19 @@
$OpenBSD: patch-autoconf_aclocal_m4,v 1.2 2002/10/19 03:07:28 brad Exp $ $OpenBSD: patch-autoconf_aclocal_m4,v 1.3 2004/01/11 07:05:31 brad Exp $
--- autoconf/aclocal.m4.orig Mon Oct 7 16:36:22 2002 --- autoconf/aclocal.m4.orig 2003-03-23 02:06:40.000000000 -0500
+++ autoconf/aclocal.m4 Fri Oct 18 22:35:10 2002 +++ autoconf/aclocal.m4 2004-01-10 23:27:34.000000000 -0500
@@ -68,7 +68,7 @@ dnl# determine whether or not -R or -rpa @@ -86,7 +86,7 @@ case "$host_os" in
AC_DEFUN(JD_INIT_RPATH, fi
[ fi
case "$host_os" in ;;
- *linux*|*solaris* ) - *osf*)
+ *linux*|*solaris*|*openbsd* ) + *osf* | *openbsd*)
if test "X$GCC" = Xyes if test "X$GCC" = Xyes
then then
if test "X$ac_R_nospace" = "Xno" RPATH="-Wl,-rpath,"
@@ -566,6 +566,25 @@ case "$host_os" in @@ -572,6 +572,25 @@ case "$host_os" in
ELFLIB="lib\$(THIS_LIB).dylib"
ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib" ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib"
ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib" ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib"
+ ;; ;;
+ *openbsd* ) + *openbsd* )
+ DYNAMIC_LINK_FLAGS="" + DYNAMIC_LINK_FLAGS=""
+ ELF_CC="$CC" + ELF_CC="$CC"
@ -28,11 +27,12 @@ $OpenBSD: patch-autoconf_aclocal_m4,v 1.2 2002/10/19 03:07:28 brad Exp $
+ esac + esac
+ ELF_LINK="$CC -shared $ELF_CFLAGS" + ELF_LINK="$CC -shared $ELF_CFLAGS"
+ ELF_LINK_CMD="\$(ELF_LINK)" + ELF_LINK_CMD="\$(ELF_LINK)"
+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lcurses" + ELF_DEP_LIBS=
+ CC_SHARED="$CC -shared $ELF_CFLAGS" + CC_SHARED="$CC -shared $ELF_CFLAGS"
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ DYNAMIC_LINK_FLAGS="-Wl,-E" + DYNAMIC_LINK_FLAGS="-Wl,-E"
+ fi + fi
;; + ;;
* ) * )
echo "Note: ELF compiler for host_os=$host_os may be wrong" echo "Note: ELF compiler for host_os=$host_os may be wrong"
ELF_CC="$CC"

6
devel/libslang/patches/patch-autoconf_configure.in
View File

@ -1,6 +1,6 @@
--- autoconf/configure.in.orig Mon Oct 7 16:36:22 2002 --- autoconf/configure.in.orig 2003-03-23 02:06:40.000000000 -0500
+++ autoconf/configure.in Fri Oct 18 22:31:58 2002 +++ autoconf/configure.in 2004-01-10 23:16:55.000000000 -0500
@@ -106,7 +106,8 @@ slang_minor_version=`echo $slang_version @@ -107,7 +107,8 @@ slang_minor_version=`echo $slang_version
slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
awk '{ print ([$]1 - [$]2*10000 - [$]3*100) }'` awk '{ print ([$]1 - [$]2*10000 - [$]3*100) }'`

6
devel/libslang/pkg/PFRAG.shared
View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2003/05/14 04:52:27 naddy Exp $ @comment $OpenBSD: PFRAG.shared,v 1.9 2004/01/11 07:05:31 brad Exp $
@comment lib/libslang.so
@comment lib/libslang.so.14
lib/libslang.so.14.9 lib/libslang.so.14.9
DYNLIBDIR(%B) DYNLIBDIR(%D/lib)