SHARED_LIBS, USE_LIBTOOL

This commit is contained in:
sturm 2005-12-30 22:26:50 +00:00
parent f88c2e3584
commit 5048cf258c
8 changed files with 29 additions and 113 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.10 2005/09/23 19:41:45 pvalchev Exp $
# $OpenBSD: Makefile,v 1.11 2005/12/30 22:26:50 sturm Exp $
COMMENT= "c++ compliant CGI applications libraries"
DISTNAME= cgicc-3.2.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= www devel
SHARED_LIBS= cgicc 4.0
MODGNU_SHARED_LIBS=cgicc ''
MASTER_SITES= ${MASTER_SITE_GNU:=cgicc/}
HOMEPAGE= http://www.gnu.org/software/cgicc/cgicc.html
@ -15,6 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/example ${WRKSRC}/support

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 18:49:49 espie Exp $
@lib lib/libcgicc.so.4.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/30 22:26:50 sturm Exp $
@lib lib/libcgicc.so.${LIBcgicc_VERSION}

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.23 2005/08/17 16:10:04 espie Exp $
# $OpenBSD: Makefile,v 1.24 2005/12/30 22:26:50 sturm Exp $
COMMENT= "C library to parse CGI Forms"
DISTNAME= cgiparse-0.9b
PKGNAME= ${DISTNAME}p0
CATEGORIES= www
SHARED_LIBS= cgiparse 1.0
HOMEPAGE= http://resnet.uoregon.edu/~gurney_j/jmpc/cgiparse.html
@ -24,6 +25,8 @@ BROKEN= "Alpha architecture not yet supported"
NO_REGRESS= Yes
MAKE_ENV= LIBcgiparse_VERSION=${LIBcgiparse_VERSION}
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"

View File

@ -1,13 +1,11 @@
--- Makefile.in.orig Sun Sep 24 12:32:11 2000
+++ Makefile.in Sat Jun 28 03:02:06 2003
@@ -29,11 +29,12 @@ LIBS+= @LIBS@
AFLAGS = -Wall -I. -I$(srcdir) $(CPPFLAGS) $(DEBUG) $(OPT) $(LIBOPTS) $(CFLAGS)
--- Makefile.in.orig Sun Sep 24 20:32:11 2000
+++ Makefile.in Fri Dec 30 22:47:00 2005
@@ -30,10 +30,10 @@ AFLAGS = -Wall -I. -I$(srcdir) $(CPPFLAG
MAJOR=1
+MINOR=0
ARNAME = lib$(LIB).a
-SONAME = lib$(LIB).so.$(MAJOR)
+SONAME = lib$(LIB).so.$(MAJOR).$(MINOR)
+SONAME = lib$(LIB).so.$(LIBcgiparse_VERSION)
PANAME = lib$(LIB)_p.a
-prefix = @prefix@
@ -15,7 +13,7 @@
exec_prefix = @exec_prefix@
LIBDIR = @libdir@
LIBOWN = 0
@@ -52,6 +53,8 @@ MAN3 = cgigetvalue.3 cgiclose.3 cginewqu
@@ -52,6 +52,8 @@ MAN3 = cgigetvalue.3 cgiclose.3 cginewqu
all: $(ARNAME) $(SONAME) $(PANAME)
@ -24,7 +22,7 @@
$(ARNAME): $(OBJS)
$(AR) rc $@ $(OBJS)
@@ -74,6 +77,20 @@ clean:
@@ -74,6 +76,20 @@ clean:
install: $(ARNAME) $(SONAME) $(PANAME) maninstall
mkdir -p -m 755 $(LIBDIR)
for i in $(ARNAME) $(SONAME) $(PANAME); do \

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 18:49:49 espie Exp $
@lib lib/libcgiparse.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/30 22:26:50 sturm Exp $
@lib lib/libcgiparse.so.${LIBcgiparse_VERSION}

View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2005/01/10 18:12:03 pedro Exp $
# $OpenBSD: Makefile,v 1.6 2005/12/30 22:26:50 sturm Exp $
COMMENT= "FastCGI Development Kit"
DISTNAME= fcgi-2.4.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= www
SHARED_LIBS= fcgi++ 0.0 \
fcgi 0.0
HOMEPAGE= http://www.fastcgi.com/
@ -18,6 +21,8 @@ WANTLIB= c
MASTER_SITES= ${HOMEPAGE}/dist/
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CAT3_FILES= FCGI_Accept FCGI_Finish FCGI_SetExitStatus \

View File

@ -1,94 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/02/11 20:13:35 sturm Exp $
--- ltmain.sh.orig 2004-02-11 20:44:06.000000000 +0100
+++ ltmain.sh 2004-02-11 20:50:08.000000000 +0100
@@ -1037,6 +1037,17 @@ compiler."
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1473,6 +1484,19 @@ compiler."
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1714,11 +1738,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\""
# 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 the \`-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,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:49:49 espie Exp $
@lib lib/libfcgi++.so.0.0
@lib lib/libfcgi.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/30 22:26:50 sturm Exp $
@lib lib/libfcgi++.so.${LIBfcgi++_VERSION}
@lib lib/libfcgi.so.${LIBfcgi_VERSION}