diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-04 05:20:14 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-04 05:20:14 +0800 |
| commit | 840d2c08bee2379d374355539d53a84768a5281d (patch) | |
| tree | b1a2e4855f7073e8fceab30e3d98964bb38e0ca5 | |
| parent | 7cf4dfdc7ed503abcb25147ea11acf20abf58cf6 (diff) | |
| download | marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar.gz marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar.bz2 marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar.lz marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar.xz marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.tar.zst marcuscom-ports-840d2c08bee2379d374355539d53a84768a5281d.zip | |
Switch to USES=libtool. This changes bundled libtool like it works on linux.
With this commit we have libglib-2.0.so.0 and libglib-2.0.so.0.3800.2. A
patch to upstream libtool to change this behaviour will be submitted upstream
soon.
Nothing should need to be rebuild for this.
We can ditch USE_GNOME=ltverhack and USE_AUTOTOOLS=libtool.
Also don't build static libs (like it is by default).
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18994 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib20/pkg-plist | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 73520bc8f..0f93a3007 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -22,13 +22,11 @@ PORTSCOUT= limitw:1,even LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ libffi.so:${PORTSDIR}/devel/libffi -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gettext gmake iconv pathfix perl5 pkgconfig shebangfix -USE_GNOME= ltverhack +USES= gettext gmake iconv libtool pathfix perl5 pkgconfig shebangfix USE_PYTHON= yes -CONFIGURE_ARGS= --enable-static \ - --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ --with-pcre=system \ --disable-fam @@ -38,6 +36,9 @@ LDFLAGS+= -L${LOCALBASE}/lib SHEBANG_FILES= */*.pl glib/gen-iswide-table.py +LIBVERSION= 0.3800.2 +PLIST_SUB+= LIBVERSION=${LIBVERSION} + OPTIONS_DEFINE= COLLATION_FIX DEBUG GDB COLLATION_FIX_DESC= fix string collation GDB_DESC= Install python gdb scripts @@ -111,6 +112,7 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.${LIBVERSION} .include <bsd.port.post.mk> diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 8649d26d3..7075c86cf 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -263,26 +263,26 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -lib/libgio-2.0.a lib/libgio-2.0.la lib/libgio-2.0.so lib/libgio-2.0.so.0 -lib/libglib-2.0.a +lib/libgio-2.0.so.%%LIBVERSION%% lib/libglib-2.0.la lib/libglib-2.0.so lib/libglib-2.0.so.0 -lib/libgmodule-2.0.a +lib/libglib-2.0.so.%%LIBVERSION%% lib/libgmodule-2.0.la lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 -lib/libgobject-2.0.a +lib/libgmodule-2.0.so.%%LIBVERSION%% lib/libgobject-2.0.la lib/libgobject-2.0.so lib/libgobject-2.0.so.0 -lib/libgthread-2.0.a +lib/libgobject-2.0.so.%%LIBVERSION%% lib/libgthread-2.0.la lib/libgthread-2.0.so lib/libgthread-2.0.so.0 +lib/libgthread-2.0.so.%%LIBVERSION%% libdata/pkgconfig/gio-2.0.pc libdata/pkgconfig/gio-unix-2.0.pc libdata/pkgconfig/glib-2.0.pc |