summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2007-05-23 05:06:03 +0000
committerschmonz <schmonz@pkgsrc.org>2007-05-23 05:06:03 +0000
commit7c876411d570de2a3c51238b505d2b25e9fd7160 (patch)
tree0388cdcde41c05a18b086b53a6929e4d87c2a611 /bootstrap
parent1db7c81ad8f27fc0aac94aaf4b074192b5cdadb0 (diff)
downloadpkgsrc-7c876411d570de2a3c51238b505d2b25e9fd7160.tar.gz
Find and replace %DATE% in the Mac .pkg. Oh, and build everything
as Universal binaries.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/mkbinarykit11
1 files changed, 9 insertions, 2 deletions
diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit
index a564b4cda6d..46fb331c7f7 100755
--- a/bootstrap/mkbinarykit
+++ b/bootstrap/mkbinarykit
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: mkbinarykit,v 1.18 2007/05/22 17:48:32 schmonz Exp $
+# $NetBSD: mkbinarykit,v 1.19 2007/05/23 05:06:03 schmonz Exp $
#
# Make a binary bootstrap kit and place it in targetdir (or current
# working directory if not specified). The mk.conf.example file is
@@ -21,7 +21,9 @@ mkbinarykit_macpkg()
rmdir ${macdestdir}${pkgdbdir} || die "rmdir destdbdir"
cp -Rp ${pkgdbdir} ${macdestdir}${pkgdbdir} || die "copy dbdir"
- ${sedprog} -e "s|%WRKDIR%|${wrkdir}|g" -e "s|%TARGETDIR%|${targetdir}|g" < macpkg.pmproj.in > ${wrkdir}/macpkg.pmproj
+ ${sedprog} -e "s|%WRKDIR%|${wrkdir}|g" \
+ -e "s|%TARGETDIR%|${targetdir}|g" -e "s|%DATE%|${date}|g" \
+ < macpkg.pmproj.in > ${wrkdir}/macpkg.pmproj
/Developer/Tools/packagemaker -build -proj ${wrkdir}/macpkg.pmproj -p "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.pkg"
ls -dl "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.pkg"
}
@@ -73,6 +75,11 @@ AIX)
syscondir=$prefix/etc
pkgdbdir=$prefix/pkgdb
;;
+Darwin)
+ ospro=universal
+ export CFLAGS='-arch i386 -arch ppc -arch ppc64 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk'
+ export LDFLAGS='-arch i386 -arch ppc -arch ppc64 -arch x86_64 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'
+ ;;
DragonFly)
case "$osrev" in
1.1[0-9]*)