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

Update to waf 1.5.2, add a patch to workaround a stupid cc version check.

Browse Source 
ok jasper@ wcmaier@
This commit is contained in:
landry 2009-01-26 19:47:12 +00:00
parent 33b462f0c0
commit ad8b01fde2
6 changed files with 64 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devel/waf/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2009/01/02 13:07:37 djm Exp $
# $OpenBSD: Makefile,v 1.4 2009/01/26 19:47:12 landry Exp $
COMMENT= Python-based build system
DISTNAME= waf-1.4.4
PKGNAME= ${DISTNAME}p0
DISTNAME= waf-1.5.2
CATEGORIES= devel
EXTRACT_SUFX= .tar.bz2
@ -23,24 +22,21 @@ NO_REGRESS= Yes
SUBST_VARS= MODPY_SITEPKG
pre-configure:
${SUBST_CMD} ${WRKSRC}/waf ${WRKSRC}/wscript
${SUBST_CMD} ${WRKSRC}/waf-light ${WRKSRC}/wscript
touch ${WRKSRC}/waf
do-configure:
cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure
cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf-light configure
do-build:
cd ${WRKSRC} && ${MODPY_BIN} ./waf
# waf overrides itself during install, so keep our patched version
pre-install:
cp ${WRKSRC}/waf{,.mine}
cd ${WRKSRC} && ${MODPY_BIN} ./waf-light
do-install:
cd ${WRKSRC} && ${MODPY_BIN} ./waf install --yes --prefix=${PREFIX}
cd ${WRKSRC} && ${MODPY_BIN} ./waf-light install --yes --prefix=${PREFIX}
# clean root owned files and overwrite with our patched version
post-install:
rm -fr ${WRKSRC}/build
${INSTALL_SCRIPT} ${WRKSRC}/waf.mine ${PREFIX}/bin/waf
${INSTALL_SCRIPT} ${WRKSRC}/waf-light ${PREFIX}/bin/waf
.include <bsd.port.mk>

10
devel/waf/distinfo
View File

@ -1,5 +1,5 @@
MD5 (waf-1.4.4.tar.bz2) = aoCeRGSXtxBZJXl3LIsivQ==
RMD160 (waf-1.4.4.tar.bz2) = XVLINSi1uQbMpOb+/caDDk/X5EE=
SHA1 (waf-1.4.4.tar.bz2) = 6Bt8ovaMO3IqtI3G6IA9qlBk3gQ=
SHA256 (waf-1.4.4.tar.bz2) = LEdBXS0d37r1xm2Ian8kT0qt8sf8vsGWSItDPVI8i/Y=
SIZE (waf-1.4.4.tar.bz2) = 473192
MD5 (waf-1.5.2.tar.bz2) = e4S7YbRH7BMCG4g8+G5HcA==
RMD160 (waf-1.5.2.tar.bz2) = 8B5Se5I8ViMp+KyhRLfQ6e9JtFI=
SHA1 (waf-1.5.2.tar.bz2) = ShuuEiEbtNwT1Ky9dJxJVifgKCM=
SHA256 (waf-1.5.2.tar.bz2) = kbjxu7gW9kOToTgR97sfo7VIYVirYdbw1wcHsi8y2zc=
SIZE (waf-1.5.2.tar.bz2) = 612284

13
devel/waf/patches/patch-waf → devel/waf/patches/patch-waf-light
View File

@ -1,13 +1,16 @@
$OpenBSD: patch-waf,v 1.1.1.1 2008/09/23 19:55:02 landry Exp $
--- waf.orig Wed Aug 27 15:01:03 2008
+++ waf Wed Aug 27 15:09:26 2008
$OpenBSD: patch-waf-light,v 1.1 2009/01/26 19:47:12 landry Exp $
trick waf-light to make it found installed version
--- waf-light.orig Mon Dec 22 00:31:57 2008
+++ waf-light Sun Jan 18 23:44:38 2009
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-#!/usr/bin/env python
+#!${MODPY_BIN}
# encoding: utf-8
# Thomas Nagy, 2005-2008
@@ -109,16 +109,7 @@ def find_lib():
@@ -102,16 +102,7 @@ def find_lib():
if w: return w
err("waf-light requires wafadmin -> export WAFDIR=/folder")

15
devel/waf/patches/patch-wafadmin_Tools_gcc_py Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-wafadmin_Tools_gcc_py,v 1.1 2009/01/26 19:47:12 landry Exp $
Workaround a stupid cc version check, cc --version doesn't output 'gcc'
--- wafadmin/Tools/gcc.py.orig Mon Dec 22 00:30:44 2008
+++ wafadmin/Tools/gcc.py Mon Jan 19 09:34:45 2009
@@ -18,7 +18,7 @@ def find_gcc(conf):
if not cc: cc = conf.find_program('cc', var='CC')
if not cc: conf.fatal('gcc was not found')
try:
- if Utils.cmd_output('%s --version' % cc).find('gcc') < 0:
+ if Utils.cmd_output('%s --version' % cc).find('GCC') < 0:
conf.fatal('gcc was not found, see the result of gcc --version')
except ValueError:
conf.fatal('gcc --version could not be executed')

24
devel/waf/patches/patch-wscript
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-wscript,v 1.1.1.1 2008/09/23 19:55:02 landry Exp $
--- wscript.orig Tue Aug 26 23:44:34 2008
+++ wscript Tue Sep 2 09:40:42 2008
$OpenBSD: patch-wscript,v 1.2 2009/01/26 19:47:12 landry Exp $
--- wscript.orig Mon Dec 22 00:31:57 2008
+++ wscript Sun Jan 18 22:32:35 2009
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!${MODPY_BIN}
# encoding: utf-8
# Thomas Nagy, 2005, 2006 (ita)
# Thomas Nagy, 2005, 2006, 2007, 2008
@@ -324,7 +324,7 @@ def build(bld):
wafadmin = bld.create_obj('py')
@@ -318,7 +318,7 @@ def build(bld):
if val != True and val != "y": sys.exit(1)
create_waf()
- dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+ dir = 'lib/python${MODPY_VERSION}/site-packages/wafadmin'
wafadmin = bld.new_task_gen('py')
wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
wafadmin.inst_var = 'PREFIX'
- wafadmin.inst_dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+ wafadmin.inst_dir = 'lib/python${MODPY_VERSION}/site-packages/wafadmin'
tools = bld.create_obj('py')
tools.find_sources_in_dirs('wafadmin/Tools', exts=['.py'])

59
devel/waf/pkg/PLIST
View File

@ -1,54 +1,30 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/09/23 19:55:02 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/01/26 19:47:12 landry Exp $
bin/waf
lib/python${MODPY_VERSION}/site-packages/wafadmin/
lib/python${MODPY_VERSION}/site-packages/wafadmin/Action.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Action.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Action.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Build.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Build.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Build.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Common.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Common.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Common.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Configure.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Configure.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Configure.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Constants.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Constants.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Constants.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/DirWatch.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/DirWatch.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/DirWatch.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Environment.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Environment.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Environment.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/FallbackAdaptor.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/FallbackAdaptor.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/FallbackAdaptor.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/FamAdaptor.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/FamAdaptor.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/FamAdaptor.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/GaminAdaptor.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/GaminAdaptor.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/GaminAdaptor.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Logs.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Logs.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Logs.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Node.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Node.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Node.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Object.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Object.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Object.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Options.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Options.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Options.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Params.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Params.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Params.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Runner.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Runner.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Runner.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scan.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scan.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scan.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scripting.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scripting.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Scripting.pyo
@ -58,37 +34,28 @@ lib/python${MODPY_VERSION}/site-packages/wafadmin/Task.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/TaskGen.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/TaskGen.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/TaskGen.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Test.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Test.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Test.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/UnitTest.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/UnitTest.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/UnitTest.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/__init__.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/__init__.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ar.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ar.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ar.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/batched_cc.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/batched_cc.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/batched_cc.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/bison.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/bison.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/bison.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost2.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost2.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/boost2.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/cc.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/cc.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/cc.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ccroot.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ccroot.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/ccroot.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/checks.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/checks.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/checks.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/compiler_cc.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/compiler_cc.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/compiler_cc.pyo
@ -110,6 +77,9 @@ lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/cxx.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/d.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/d.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/d.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dbus.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dbus.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dbus.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dmd.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dmd.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/dmd.pyo
@ -128,6 +98,9 @@ lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gcc.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gdc.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gdc.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gdc.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/glib2.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/glib2.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/glib2.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gnome.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gnome.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gnome.pyo
@ -137,6 +110,9 @@ lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gnu_dirs.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gob2.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gob2.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/gob2.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/icc.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/icc.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/icc.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/intltool.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/intltool.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/intltool.pyo
@ -194,9 +170,6 @@ lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/vala.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/winres.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/winres.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Tools/winres.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/UnitTest.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/UnitTest.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/UnitTest.pyo
lib/python${MODPY_VERSION}/site-packages/wafadmin/Utils.py
lib/python${MODPY_VERSION}/site-packages/wafadmin/Utils.pyc
lib/python${MODPY_VERSION}/site-packages/wafadmin/Utils.pyo