diff options
| author | hubertf <hubertf> | 2000-05-22 02:00:56 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-05-22 02:00:56 +0000 |
| commit | c284e87b77b9f6a63d5749cec74ee97e21ad2c67 (patch) | |
| tree | 282192c30931df438d5aace78eb22e3061d98115 /sysutils | |
| parent | 122fd5ed66ab93dbdaf6f3c54287848bb0edc965 (diff) | |
| download | pkgsrc-c284e87b77b9f6a63d5749cec74ee97e21ad2c67.tar.gz | |
Fix building on machines where ${MACHINE} != ${MACHINE_ARCH}, like macppc.
Patches sent in by SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp> in PR 10168.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/cdrecord/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/cdrecord/files/patch-sum | 3 | ||||
| -rw-r--r-- | sysutils/cdrecord/patches/patch-af | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 10b6674d2a9..5ec7d73a04c 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2000/03/03 15:22:15 scw Exp $ +# $NetBSD: Makefile,v 1.28 2000/05/22 02:00:56 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp # @@ -12,7 +12,7 @@ HOMEPAGE= http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//} -TARGET_ARCH= ${MACHINE}-netbsd-cc +TARGET_ARCH= ${MACHINE_ARCH}-netbsd-cc TARGET_DIR= OBJ/${TARGET_ARCH} post-configure: diff --git a/sysutils/cdrecord/files/patch-sum b/sysutils/cdrecord/files/patch-sum index 8ed93684210..05190ea77cc 100644 --- a/sysutils/cdrecord/files/patch-sum +++ b/sysutils/cdrecord/files/patch-sum @@ -1,6 +1,7 @@ -$NetBSD: patch-sum,v 1.5 2000/03/15 00:09:07 hubertf Exp $ +$NetBSD: patch-sum,v 1.6 2000/05/22 02:00:57 hubertf Exp $ MD5 (patch-aa) = 7490f9d7cc82b64927a630b8fb6683ca MD5 (patch-ab) = 39b1982d628e4b004c9d0e5901c156b3 MD5 (patch-ac) = fbf28297f94c6609087ce37b936d98c8 MD5 (patch-ae) = 5d9bcff9749c4c9378ea949d69bf4b02 +MD5 (patch-af) = 82018d82a174d9d22e4f0f09d2a20276 diff --git a/sysutils/cdrecord/patches/patch-af b/sysutils/cdrecord/patches/patch-af new file mode 100644 index 00000000000..3311fa978aa --- /dev/null +++ b/sysutils/cdrecord/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2000/05/22 02:00:57 hubertf Exp $ + +--- RULES/mk-gmake.id.orig Thu Mar 9 22:36:18 2000 ++++ RULES/mk-gmake.id Thu Mar 9 22:36:52 2000 +@@ -41,7 +41,7 @@ + _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null + + XP_ARCH:= $(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') +-XK_ARCH:= $(shell uname -m | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') ++XK_ARCH:= $(shell uname -p | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') + XM_ARCH:= $(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') + + P_ARCH= $(XP_ARCH) |