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

SHARED_LIBS and some USE_LIBTOOL

Browse Source
This commit is contained in:
naddy 2005-12-30 00:35:13 +00:00
parent 4349a3bf42
commit 589c1e6bd5
14 changed files with 36 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/gtk2mm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2005/11/15 09:21:52 wilfried Exp $
# $OpenBSD: Makefile,v 1.6 2005/12/30 00:35:13 naddy Exp $
COMMENT= "C++ interface for gtk2+"
COMMENT-docs= "C++ interface for gtk2+ documentation"
@ -9,6 +9,19 @@ PKGNAME= gtk2mm-${VERSION}p3
PKGNAME-docs= gtk2mm-docs-${VERSION}
CATEGORIES= devel x11
SHARED_LIBS= atkmm-1.6 1.21 \
gdkmm-2.4 1.21 \
gtkmm-2.4 1.21 \
pangomm-1.4 1.21
MODGNU_SHARED_LIBS= atkmm-1.6 '' \
gdkmm-2.4 '' \
gtkmm-2.4 '' \
pangomm-1.4 ''
LIBatkmm-1.6_ALIAS= atkmm_1_6
LIBgdkmm-2.4_ALIAS= gdkmm_2_4
LIBgtkmm-2.4_ALIAS= gtkmm_2_4
LIBpangomm-1.4_ALIAS= pangomm_1_4
HOMEPAGE= http://www.gtkmm.org/
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>

10
x11/gtk2mm/pkg/PFRAG.shared
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/11/02 23:53:22 wilfried Exp $
@lib lib/libatkmm-1.6.so.1.21
@lib lib/libgdkmm-2.4.so.1.21
@lib lib/libgtkmm-2.4.so.1.21
@lib lib/libpangomm-1.4.so.1.21
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/30 00:35:14 naddy Exp $
@lib lib/libatkmm-1.6.so.${LIBatkmm-1.6_VERSION}
@lib lib/libgdkmm-2.4.so.${LIBgdkmm-2.4_VERSION}
@lib lib/libgtkmm-2.4.so.${LIBgtkmm-2.4_VERSION}
@lib lib/libpangomm-1.4.so.${LIBpangomm-1.4_VERSION}

9
x11/gtkglarea/Makefile
View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2005/02/21 19:44:46 alek Exp $
# $OpenBSD: Makefile,v 1.23 2005/12/30 00:35:14 naddy Exp $
COMMENT= "OpenGL widget for GTK+ GUI toolkit"
DISTNAME= gtkglarea-1.2.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= gtkgl 1.2
MODGNU_SHARED_LIBS= gtkgl ''
CATEGORIES= x11 graphics
MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
@ -20,7 +22,8 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
SEPARATE_BUILD= concurrent
SEPARATE_BUILD= simple
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --with-lib-GL

11
x11/gtkglarea/patches/patch-gtkgl_Makefile.in
View File

@ -1,11 +0,0 @@
--- gtkgl/Makefile.in.orig Tue Feb 22 13:34:07 2000
+++ gtkgl/Makefile.in Wed Mar 15 09:38:56 2000
@@ -90,7 +90,7 @@
gtkglinclude_HEADERS = gdkgl.h gtkglarea.h
libgtkgl_la_SOURCES = gdkgl.c gtkglarea.c
-libgtkgl_la_LDFLAGS = -version-info $(GTKGL_LIBRARY_VERSION)
+libgtkgl_la_LDFLAGS = -version-info 1:2:0
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)

51
x11/gtkglarea/patches/patch-ltconfig
View File

@ -1,51 +0,0 @@
--- ltconfig.orig Thu Feb 17 13:42:54 2000
+++ ltconfig Tue Feb 20 12:31:19 2001
@@ -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*)

83
x11/gtkglarea/patches/patch-ltmain.sh
View File

@ -1,83 +0,0 @@
--- ltmain.sh.orig Thu Feb 17 13:42:54 2000
+++ ltmain.sh Tue Feb 20 12:33:12 2001
@@ -1073,7 +1073,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*)
@@ -1085,6 +1096,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1789,6 +1804,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"
@@ -3522,40 +3540,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
;;

4
x11/gtkglarea/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 19:26:29 espie Exp $
@lib lib/libgtkgl.so.1.2
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/30 00:35:14 naddy Exp $
@lib lib/libgtkgl.so.${LIBgtkgl_VERSION}

3
x11/gtkglarea/pkg/PLIST
View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:26:29 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2005/12/30 00:35:14 naddy Exp $
include/gtkgl/
include/gtkgl/gdkgl.h
include/gtkgl/gtkglarea.h
lib/libgtkgl.a
lib/libgtkgl.la
share/aclocal/
share/aclocal/gtkgl.m4
share/doc/gtkglarea/
share/doc/gtkglarea/HOWTO.txt

7
x11/gtkmm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2005/11/20 14:18:08 wilfried Exp $
# $OpenBSD: Makefile,v 1.24 2005/12/30 00:35:14 naddy Exp $
COMMENT= "C++ interface for gtk+"
COMMENT-docs= "C++ interface for gtk+ documentation"
@ -7,6 +7,10 @@ VERSION= 1.2.10
DISTNAME= gtkmm-${VERSION}
PKGNAME= ${DISTNAME}p3
PKGNAME-docs= gtkmm-docs-${VERSION}
SHARED_LIBS= gdkmm 2.2 \
gtkmm 2.5
MODGNU_SHARED_LIBS= gdkmm '' \
gtkmm ''
CATEGORIES= devel x11
HOMEPAGE= http://gtkmm.sourceforge.net/
@ -36,7 +40,6 @@ WANTLIB=
SEPARATE_BUILD= concurrent
USE_X11= Yes
NO_REGRESS= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu

12
x11/gtkmm/patches/patch-aclocal_m4
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2002/04/19 16:34:16 wilfried Exp $
--- aclocal.m4.orig Tue Apr 9 14:30:17 2002
+++ aclocal.m4 Fri Apr 19 16:46:52 2002
@@ -1730,7 +1730,7 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared -fPIC -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no

21
x11/gtkmm/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2005/09/06 19:58:03 espie Exp $
--- configure.orig Sat Jun 15 18:34:48 2002
+++ configure Mon Aug 29 16:33:12 2005
@@ -738,7 +738,7 @@ GTKMM_MICRO_VERSION=10
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LIBGTKMM_SO_VERSION=3:4:3
+LIBGTKMM_SO_VERSION=2:5:2
LIBGDKMM_SO_VERSION=2:2:1
GTKMM_VERSION=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION.$GTKMM_MICRO_VERSION
@@ -3777,7 +3777,7 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared -fPIC -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no

12
x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gdk--_gdk--_Makefile_in,v 1.2 2005/09/06 19:58:03 espie Exp $
--- gdk--/gdk--/Makefile.in.orig Sat Jun 15 18:41:32 2002
+++ gdk--/gdk--/Makefile.in Mon Aug 29 16:33:12 2005
@@ -110,7 +110,7 @@ libgdkmm_la_SOURCES = \
color.cc drawable.cc gc.cc pixmap.cc visual.cc \
image.cc types.cc cursor.cc
-libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE)
+libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION)
libgdkmmincludedir = $(includedir)/gdk--
libgdkmminclude_HEADERS = \

12
x11/gtkmm/patches/patch-src_gtk--_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_gtk--_Makefile_in,v 1.2 2002/04/19 16:34:16 wilfried Exp $
--- src/gtk--/Makefile.in.orig Tue Apr 9 14:34:18 2002
+++ src/gtk--/Makefile.in Fri Apr 19 16:48:23 2002
@@ -142,7 +142,7 @@ include_HEADERS = $(gtkmmh) marshal.h pr
# This builds the library
libgtkmm_la_SOURCES = $(gtkmmc) gtk--.cc proxy.cc base.cc marshal.cc
-libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -release $(GTKMM_RELEASE) -no-undefined
+libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION)
libgtkmm_la_INCLUDES = $(GTK_CFLAGS)
libgtkmm_la_LIBADD = $(GTK_LIBS) $(gtkmmla)
#libgtkmm_la_DEPENDENCIES = $(gtkmmla)

6
x11/gtkmm/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2004/09/15 19:26:29 espie Exp $
@lib lib/libgdkmm.so.2.2
@lib lib/libgtkmm.so.2.5
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/30 00:35:14 naddy Exp $
@lib lib/libgdkmm.so.${LIBgdkmm_VERSION}
@lib lib/libgtkmm.so.${LIBgtkmm_VERSION}