SHARED_LIBS and some USE_LIBTOOL
This commit is contained in:
naddy
parent
5cab7a8ec3
commit
e23c4dd432
@ -1,9 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.51 2005/10/30 00:10:42 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.52 2005/12/26 18:45:10 naddy Exp $
|
||||
# $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $
|
||||
|
||||
COMMENT= "API compatible clone of the Motif toolkit"
|
||||
COMMENT= "API-compatible clone of the Motif toolkit"
|
||||
|
||||
DISTNAME= lesstif-0.92.6
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
SHARED_LIBS= Mrm 1.2 \
|
||||
Uil 1.2 \
|
||||
Xm 1.2
|
||||
MODGNU_SHARED_LIBS= Mrm '' \
|
||||
Uil '' \
|
||||
Xm ''
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \
|
||||
ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
|
||||
@ -20,6 +27,7 @@ WANTLIB= ICE Xt c X11 SM Xext
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/Xlt ${WRKSRC}/lib/Xbae
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
--- ltconfig.orig Sun Jan 21 15:01:27 2001
|
||||
+++ ltconfig Sun Jan 21 15:01:36 2001
|
||||
@@ -1105,6 +1105,9 @@
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1396,10 +1399,21 @@
|
||||
;;
|
||||
|
||||
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*)
|
||||
@@ -1997,13 +2011,10 @@
|
||||
|
||||
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*)
|
||||
@ -1,83 +0,0 @@
|
||||
--- ltmain.sh.orig Thu Dec 21 07:42:47 2000
|
||||
+++ ltmain.sh Tue Feb 20 12:55:57 2001
|
||||
@@ -1079,7 +1079,18 @@ compiler."
|
||||
# These systems don't actually have c library (as such)
|
||||
continue
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ continue
|
||||
+ ;;
|
||||
esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
elif test "$arg" = "-lm"; then
|
||||
case "$host" in
|
||||
*-*-cygwin* | *-*-beos*)
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1795,6 +1810,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/09/15 19:26:30 espie Exp $
|
||||
@lib LessTif/Motif1.2/lib/libMrm.so.1.2
|
||||
@lib LessTif/Motif1.2/lib/libUil.so.1.2
|
||||
@lib LessTif/Motif1.2/lib/libXm.so.1.2
|
||||
@lib lib/libMrm.so.1.2
|
||||
@lib lib/libUil.so.1.2
|
||||
@lib lib/libXm.so.1.2
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/26 18:45:10 naddy Exp $
|
||||
@lib LessTif/Motif1.2/lib/libMrm.so.${LIBMrm_VERSION}
|
||||
@lib LessTif/Motif1.2/lib/libUil.so.${LIBUil_VERSION}
|
||||
@lib LessTif/Motif1.2/lib/libXm.so.${LIBXm_VERSION}
|
||||
@lib lib/libMrm.so.${LIBMrm_VERSION}
|
||||
@lib lib/libUil.so.${LIBUil_VERSION}
|
||||
@lib lib/libXm.so.${LIBXm_VERSION}
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2005/10/30 00:10:42 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2005/12/26 18:45:10 naddy Exp $
|
||||
|
||||
COMMENT= "small, fast & usable window manager"
|
||||
|
||||
DISTNAME= openbox-3.2
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
SHARED_LIBS= obparser 2.0 \
|
||||
obrender 2.0
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= http://icculus.org/openbox/releases/
|
||||
|
||||
@ -29,6 +31,11 @@ USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
|
||||
|
||||
# MODGNU_SHARED_LIBS can't handle idiosyncratic naming convention
|
||||
.for n v in ${SHARED_LIBS}
|
||||
MAKE_FLAGS+= ${n:S/^ob//}_lib$n_la_LDFLAGS='-version-info ${v:S/./:/}:0'
|
||||
.endfor
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
post-install:
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 19:26:30 espie Exp $
|
||||
@lib lib/libobparser.so.2.0
|
||||
@lib lib/libobrender.so.2.0
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 18:45:10 naddy Exp $
|
||||
@lib lib/libobparser.so.${LIBobparser_VERSION}
|
||||
@lib lib/libobrender.so.${LIBobrender_VERSION}
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2005/10/02 08:32:03 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2005/12/26 18:45:10 naddy Exp $
|
||||
|
||||
COMMENT= "displays text on your screen"
|
||||
|
||||
DISTNAME= xosd-2.2.12
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
SHARED_LIBS= xosd 4.12
|
||||
MODGNU_SHARED_LIBS= xosd -pthread
|
||||
CATEGORIES= x11 graphics
|
||||
HOMEPAGE= http://www.ignavus.net/software.html
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/11/11 05:16:29 jcs Exp $
|
||||
@lib lib/libxosd.so.4.12
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/26 18:45:11 naddy Exp $
|
||||
@lib lib/libxosd.so.${LIBxosd_VERSION}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user