SHARED_LIBS, USE_LIBTOOl

This commit is contained in:
sturm 2005-12-26 21:32:00 +00:00
parent 94284f6400
commit e0d4ddb902
19 changed files with 99 additions and 182 deletions

View File

@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.7 2004/07/07 23:22:38 xsa Exp $
# $OpenBSD: Makefile,v 1.8 2005/12/26 21:32:00 sturm Exp $
COMMENT= "ODBC 2.x driver manager"
DISTNAME= libiodbc-2.50.3
PKGNAME= iodbc-2.50.3
PKGNAME= iodbc-2.50.3p0
CATEGORIES= databases
SHARED_LIBS= iodbc 2.50
MODGNU_SHARED_LIBS=iodbc ''
LIBiodbc_ALIAS= realiodbc
HOMEPAGE= http://www.iodbc.org/
@ -18,6 +21,8 @@ PERMIT_DISTFILES_FTP= yes
MASTER_SITES= ${HOMEPAGE}downloads/iODBC/
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-iodbc-inidir="${SYSCONFDIR}"

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/12/26 21:32:01 sturm Exp $
--- Makefile.in.orig Mon Dec 26 20:17:53 2005
+++ Makefile.in Mon Dec 26 20:18:25 2005
@@ -101,7 +101,7 @@ SUBDIRS = . samples
lib_LTLIBRARIES = libiodbc.la
-libiodbc_la_LDFLAGS = -version-info @lib_version@ -export-symbols $(srcdir)/iodbc.exp
+libiodbc_la_LDFLAGS = ${librealiodbc_la_LDFLAGS} -export-symbols $(srcdir)/iodbc.exp
libiodbc_la_LIBADD = $(LIBADD_DL)
libiodbc_la_SOURCES = catalog.c connect.c dlf.c dlproc.c execute.c fetch.c hdbc.c henv.c herr.c hstmt.c info.c itrace.c misc.c prepare.c result.c

View File

@ -1,52 +0,0 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/02/19 17:59:42 danh Exp $
--- ltconfig.orig Mon Feb 19 12:47:27 2001
+++ ltconfig Mon Feb 19 12:50:06 2001
@@ -1030,6 +1030,9 @@ cygwin* | mingw*)
freebsd2* | sunos4*)
exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1262,10 +1265,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*)
@@ -1789,13 +1803,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,80 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/19 17:59:42 danh Exp $
--- ltmain.sh.orig Mon Feb 19 12:47:22 2001
+++ ltmain.sh Mon Feb 19 12:52:16 2001
@@ -1010,6 +1010,25 @@ compiler."
;;
-l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-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
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
deplibs="$deplibs $arg"
;;
@@ -1702,6 +1721,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2*)
# 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"
@@ -3326,40 +3348,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
;;

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/08 16:50:45 espie Exp $
@lib lib/libiodbc.so.2.50
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 21:32:01 sturm Exp $
@lib lib/libiodbc.so.${LIBiodbc_VERSION}

View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/10/02 13:26:31 alek Exp $
# $OpenBSD: Makefile,v 1.2 2005/12/26 21:32:01 sturm Exp $
COMMENT= "C++ client API for PostgreSQL"
DISTNAME= libpqxx-2.5.3
CATEGORIES= databases
SHARED_LIBS= pqxx 0.0
MODGNU_SHARED_LIBS=pqxx ''
LIBpqxx_ALIAS= realpqxx
HOMEPAGE= http://gborg.postgresql.org/project/libpqxx/

View File

@ -1,15 +1,16 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2005/10/02 13:26:31 alek Exp $
$OpenBSD: patch-src_Makefile_in,v 1.2 2005/12/26 21:32:01 sturm Exp $
--- src/Makefile.in.orig Thu May 19 10:22:36 2005
+++ src/Makefile.in Wed Jun 15 21:28:57 2005
@@ -214,9 +217,9 @@ libpqxx_la_SOURCES = binarystring.cxx \
+++ src/Makefile.in Mon Dec 26 21:44:11 2005
@@ -214,10 +214,10 @@ libpqxx_la_SOURCES = binarystring.cxx \
# Uncomment to build an unversioned library (version in soname)
-libpqxx_version = -release $(PQXXVERSION)
+# libpqxx_version = -release $(PQXXVERSION)
# Uncomment to build a versioned library
-#libpqxx_version = -version-info $(ABI_CURRENT):$(ABI_REVISION):$(ABI_AGE)
+# libpqxx_version = -version-info $(ABI_CURRENT):$(ABI_REVISION):$(ABI_AGE)
libpqxx_la_LDFLAGS = $(libpqxx_version) \
#libpqxx_version = -version-info $(ABI_CURRENT):$(ABI_REVISION):$(ABI_AGE)
-libpqxx_la_LDFLAGS = $(libpqxx_version) \
+libpqxx_la_LDFLAGS = ${librealpqxx_la_LDFLAGS} \
-rpath $(libdir) \
${POSTGRES_LIB}

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/10/02 13:26:31 alek Exp $
@lib lib/libpqxx.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/26 21:32:01 sturm Exp $
@lib lib/libpqxx.so.${LIBpqxx_VERSION}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.112 2005/12/12 04:55:43 brad Exp $
# $OpenBSD: Makefile,v 1.113 2005/12/26 21:32:01 sturm Exp $
# Uses pthreads
.if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "m88k"
@ -11,11 +11,14 @@ COMMENT-tests= "multithreaded SQL database (regression test suite)"
VERSION= 4.1.15
DISTNAME= mysql-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}p0
PKGNAME-server= mysql-server-${VERSION}
FULLPKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES= databases
V= MySQL-4.1
SHARED_LIBS= mysqlclient 14.0 \
mysqlclient_r 14.0
MASTER_SITES= http://mysql.mirrors.pair.com/Downloads/$V/
HOMEPAGE= http://www.mysql.com/
@ -41,6 +44,7 @@ CXXFLAGS= ${CFLAGS} -felide-constructors -fno-exceptions -fno-rtti
VMEM_WARNING= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
@ -91,8 +95,9 @@ WANTLIB=
DOCS= manual.html manual.ps manual_toc.html manual.txt
post-install:
cd ${PREFIX}/lib && ln -sf mysql/libmysqlclient.so.14.0 . && \
ln -sf mysql/libmysqlclient_r.so.14.0 .
cd ${PREFIX}/lib && \
ln -sf mysql/libmysqlclient.so.${LIBmysqlclient_VERSION} . && \
ln -sf mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION} .
do-regress:
@cd ${WRKSRC}/mysql-test && ./mysql-test-run --force

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2005/03/23 03:47:20 brad Exp $
--- ltmain.sh.orig Fri Mar 4 19:38:28 2005
+++ ltmain.sh Tue Mar 15 09:38:55 2005
@@ -1403,7 +1403,7 @@ EOF
;;
-shrext)
- prev=shrext
+ prev=shrext_cmds
continue
;;

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/09/04 22:51:24 brad Exp $
@lib lib/libmysqlclient.so.14.0
@lib lib/libmysqlclient_r.so.14.0
@lib lib/mysql/libmysqlclient.so.14.0
@lib lib/mysql/libmysqlclient_r.so.14.0
@comment $OpenBSD: PFRAG.shared,v 1.9 2005/12/26 21:32:01 sturm Exp $
@lib lib/libmysqlclient.so.${LIBmysqlclient_VERSION}
@lib lib/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
@lib lib/mysql/libmysqlclient.so.${LIBmysqlclient_VERSION}
@lib lib/mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}

View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2005/12/22 11:42:02 bernd Exp $
# $OpenBSD: Makefile,v 1.5 2005/12/26 21:32:01 sturm Exp $
COMMENT= "high performance embedded database library"
DISTNAME= qdbm-1.8.36
CATEGORIES= databases
SHARED_LIBS= qdbm 11.8
HOMEPAGE= http://qdbm.sourceforge.net
HOMEPAGE= http://qdbm.sourceforge.net/
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
@ -25,4 +26,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-zlib \
--enable-iconv
MAKE_FLAGS= LIBVER=${LIBqdbm_VERSION:R} LIBREV=${LIBqdbm_VERSION:E}
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/22 11:42:02 bernd Exp $
@lib lib/libqdbm.so.11.8
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/26 21:32:01 sturm Exp $
@lib lib/libqdbm.so.${LIBqdbm_VERSION}

View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2005/12/21 07:58:31 jolan Exp $
# $OpenBSD: Makefile,v 1.12 2005/12/26 21:32:01 sturm Exp $
COMMENT= "Embedded SQL implementation"
DISTNAME= sqlite-2.8.17
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= databases
SHARED_LIBS= sqlite 8.6
MODGNU_SHARED_LIBS=sqlite ''
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://www.sqlite.org/
@ -16,6 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
AUTOCONF_VERSION=2.59
USE_GMAKE= Yes
USE_LIBTOOL= Yes
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
WANTLIB= c ncurses readline

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/12/21 07:58:32 jolan Exp $
--- Makefile.in.orig Wed Dec 21 01:47:20 2005
+++ Makefile.in Wed Dec 21 01:47:37 2005
$OpenBSD: patch-Makefile_in,v 1.2 2005/12/26 21:32:01 sturm Exp $
--- Makefile.in.orig Sun Apr 24 00:43:23 2005
+++ Makefile.in Mon Dec 26 22:00:23 2005
@@ -141,6 +141,7 @@ SRC = \
# Source code to the test files.
#
@ -9,3 +9,12 @@ $OpenBSD: patch-Makefile_in,v 1.1 2005/12/21 07:58:32 jolan Exp $
$(TOP)/src/btree.c \
$(TOP)/src/func.c \
$(TOP)/src/os.c \
@@ -188,7 +189,7 @@ last_change: $(SRC)
libsqlite.la: $(LIBOBJ)
$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
- -version-info "8:6:8"
+ ${libsqlite_la_LDFLAGS}
libtclsqlite.la: tclsqlite.lo libsqlite.la
$(LTLINK) -o libtclsqlite.la tclsqlite.lo \

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/14 23:31:47 espie Exp $
@lib lib/libsqlite.so.8.6
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/26 21:32:01 sturm Exp $
@lib lib/libsqlite.so.${LIBsqlite_VERSION}

View File

@ -1,12 +1,15 @@
# $OpenBSD: Makefile,v 1.13 2005/12/21 03:51:40 jolan Exp $
# $OpenBSD: Makefile,v 1.14 2005/12/26 21:32:01 sturm Exp $
COMMENT= "Embedded SQL implementation"
COMMENT-tcl= "TCL bindings for Sqlite3"
V= 3.2.8
DISTNAME= sqlite-${V}
PKGNAME= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME= sqlite3-${V}p0
PKGNAME-tcl= sqlite3-tcl-${V}p0
CATEGORIES= databases
SHARED_LIBS= sqlite3 8.6
MODGNU_SHARED_LIBS=sqlite3 ''
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://www.sqlite.org/
@ -21,6 +24,8 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
WANTLIB= c ncurses readline
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/12/26 21:32:01 sturm Exp $
--- Makefile.in.orig Mon Dec 26 22:10:12 2005
+++ Makefile.in Mon Dec 26 22:11:17 2005
@@ -233,7 +233,8 @@ last_change: $(SRC)
libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
- ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+ ${ALLOWRELEASE} -rpath $(libdir) \
+ ${libsqlite3_la_LDFLAGS}
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
$(LTLINK) -o libtclsqlite3.la tclsqlite.lo \

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/11/07 00:10:17 djm Exp $
@lib lib/libsqlite3.so.8.6
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/26 21:32:01 sturm Exp $
@lib lib/libsqlite3.so.${LIBsqlite3_VERSION}