- SHARED_LIBS.

- USE_LIBTOOL=Yes.
- PKGNAME bump.

"looks fine" alek@, ok espie@
This commit is contained in:
aanriot 2005-12-27 12:33:42 +00:00
parent f603af46ea
commit a3e5eadfa7
4 changed files with 8 additions and 66 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2005/10/23 09:52:21 alek Exp $ # $OpenBSD: Makefile,v 1.22 2005/12/27 12:33:42 aanriot Exp $
COMMENT= "easy to use, graphical editor" COMMENT= "easy to use, graphical editor"
@ -6,6 +6,10 @@ CATEGORIES= editors
MASTER_SITES= ${HOMEPAGE} MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/ HOMEPAGE= ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
DISTNAME= cooledit-3.17.14 DISTNAME= cooledit-3.17.14
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= Cw 1.0
MODGNU_SHARED_LIBS= Cw ''
MAINTAINER= Marc Espie <espie@openbsd.org> MAINTAINER= Marc Espie <espie@openbsd.org>
@ -14,6 +18,7 @@ FLAVOR?=
PYTHON_VER= 2.3 PYTHON_VER= 2.3
WANTLIB= X11 c util WANTLIB= X11 c util
USE_LIBTOOL= Yes
.if ${FLAVOR:L:Mpython} .if ${FLAVOR:L:Mpython}
LIB_DEPENDS+= python${PYTHON_VER}.0.0:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} LIB_DEPENDS+= python${PYTHON_VER}.0.0:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}

View File

@ -1,51 +0,0 @@
--- ltconfig.orig 2002-08-03 13:03:26.000000000 +0200
+++ ltconfig 2003-08-01 20:33:56.000000000 +0200
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1391,10 +1394,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1955,13 +1969,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,12 +0,0 @@
--- ltmain.sh.orig Sat Nov 27 09:46:02 2004
+++ ltmain.sh Thu Apr 28 22:24:50 2005
@@ -1348,6 +1348,9 @@ EOF
prev=
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
eval "$prev=\"\$arg\""
prev=

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 18:01:06 espie Exp $ @comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/27 12:33:42 aanriot Exp $
@lib lib/libCw.so.1.0 @lib lib/libCw.so.${LIBCw_VERSION}