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

Adjust now that libtool lives in base

Browse Source 
ok aja@ (who came up with the same goi diff)
This commit is contained in:
jasper 2012-06-19 17:21:15 +00:00
parent 76fbad9f1b
commit 135c62319b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/gobject-introspection/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.58 2012/04/18 08:41:58 jasper Exp $
# $OpenBSD: Makefile,v 1.59 2012/06/19 17:21:15 jasper Exp $
COMMENT= GObject Introspection
GNOME_VERSION= 1.32.1
GNOME_PROJECT= gobject-introspection
REVISION= 0
CATEGORIES= devel
SHARED_LIBS += girepository-1.0 3.0 # 1.0

8
devel/gobject-introspection/patches/patch-giscanner_utils_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-giscanner_utils_py,v 1.2 2011/04/07 11:09:06 ajacoutot Exp $
$OpenBSD: patch-giscanner_utils_py,v 1.3 2012/06/19 17:21:15 jasper Exp $
Make sure try to compile/link with the right libtool,
this overrides the --libtool option to girscanner.
--- giscanner/utils.py.orig Tue Sep 7 16:25:05 2010
+++ giscanner/utils.py Thu Apr 7 12:52:18 2011
--- giscanner/utils.py.orig Fri Jun 10 17:36:50 2011
+++ giscanner/utils.py Tue Jun 19 11:32:58 2012
@@ -107,22 +107,8 @@ def get_libtool_command(options):
if not libtool_infection:
return None
@ -25,7 +25,7 @@ this overrides the --libtool option to girscanner.
- return None
-
- return ['libtool']
+ libtool_cmd = os.environ.get('LIBTOOL', '/usr/ports/infrastructure/bin/libtool')
+ libtool_cmd = os.environ.get('LIBTOOL', '/usr/bin/libtool')
+ return libtool_cmd.split()

3
lang/librep/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2012/05/03 20:46:24 jasper Exp $
# $OpenBSD: Makefile,v 1.57 2012/06/19 17:21:15 jasper Exp $
COMMENT= Emacs Lisp-like runtime library
@ -6,6 +6,7 @@ SHARED_ONLY= Yes
VERSION= 0.92.2
DISTNAME= librep-${VERSION}
REVISION= 0
SHARED_LIBS += rep 14.0 # .16.0