Add more libtool love. Set SHARED_ONLY.

f-spot now starts and works fine (very small testing).
However, some icons do not show up correctly yet and it cores dump on exit
so I'm leaving it broken for now.
This commit is contained in:
ajacoutot 2010-03-24 21:56:18 +00:00
parent 6031e2e321
commit b77db1756c
5 changed files with 19 additions and 16 deletions

View File

@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.23 2010/03/24 12:18:44 robert Exp $
# $OpenBSD: Makefile,v 1.24 2010/03/24 21:56:18 ajacoutot Exp $
BROKEN= waiting for antoine@
SHARED_ONLY= Yes
BROKEN= waiting for ajacoutot@
COMMENT= personal photo management application for GNOME
GNOME_VERSION= 0.6.1.5
GNOME_PROJECT= f-spot
PKGNAME= ${DISTNAME}p0
CATEGORIES= graphics
@ -49,8 +52,12 @@ LIB_DEPENDS+= exif::graphics/libexif \
MODGCONF2_SCHEMAS_DIR= f-spot
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-scrollkeeper
--disable-scrollkeeper \
--disable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.5 2010/03/24 12:18:44 robert Exp $
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.6 2010/03/24 21:56:18 ajacoutot Exp $
--- lib/libfspot/Makefile.in.orig Wed Nov 4 20:35:15 2009
+++ lib/libfspot/Makefile.in Wed Mar 24 12:21:13 2010
@@ -87,7 +87,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
@ -6,7 +6,7 @@ $OpenBSD: patch-lib_libfspot_Makefile_in,v 1.5 2010/03/24 12:18:44 robert Exp $
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ --mode=link $(CCLD) -avoid-version $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ --mode=link $(CCLD) -module -avoid-version $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libfspot_la_SOURCES)
DIST_SOURCES = $(libfspot_la_SOURCES)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.3 2010/03/24 12:18:44 robert Exp $
$OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.4 2010/03/24 21:56:18 ajacoutot Exp $
--- lib/libjpegtran/Makefile.in.orig Wed Nov 4 20:35:15 2009
+++ lib/libjpegtran/Makefile.in Wed Mar 24 12:21:32 2010
@@ -68,7 +68,7 @@ am__base_list = \
@ -15,7 +15,7 @@ $OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.3 2010/03/24 12:18:44 robert Exp
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ --mode=link $(CCLD) -avoid-version $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ --mode=link $(CCLD) -module -avoid-version $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libfspotjpegtran_la_SOURCES)
DIST_SOURCES = $(libfspotjpegtran_la_SOURCES)

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/03/24 12:18:44 robert Exp $
lib/f-spot/libfspot.so
lib/f-spot/libfspotjpegtran.so

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2010/03/24 12:18:44 robert Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.13 2010/03/24 21:56:18 ajacoutot Exp $
bin/f-spot
bin/f-spot-sqlite-upgrade
lib/f-spot/
@ -65,10 +64,10 @@ lib/f-spot/gkeyfile-sharp.dll
lib/f-spot/gnome-keyring-sharp.dll
lib/f-spot/gtk-sharp-beans.dll
lib/f-spot/gtk-sharp-beans.dll.config
lib/f-spot/libfspot.a
lib/f-spot/libfspot.la
lib/f-spot/libfspotjpegtran.a
lib/f-spot/libfspotjpegtran.la
@comment lib/f-spot/libfspot.la
lib/f-spot/libfspot.so
@comment lib/f-spot/libfspotjpegtran.la
lib/f-spot/libfspotjpegtran.so
lib/f-spot/libgphoto2-sharp.dll
lib/f-spot/libgphoto2-sharp.dll.config
lib/pkgconfig/f-spot.pc