pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cygwin*: move away from USE_CROSSBASE.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jun 19 18:49:16 2016 +0200
Changeset:	a7ba72ef10e95183658941bf5cd2a58f2a203933

Modified Files:
	cygwin-binutils/Makefile
	cygwin/Makefile.common

Log Message:
cygwin*: move away from USE_CROSSBASE.

Untested since I can't fetch the distfile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a7ba72ef10e95183658941bf5cd2a58f2a203933

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cygwin-binutils/Makefile |  2 --
 cygwin/Makefile.common   | 15 +++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs:
diff --git a/cygwin-binutils/Makefile b/cygwin-binutils/Makefile
index 45384c8..7003f7a 100644
--- a/cygwin-binutils/Makefile
+++ b/cygwin-binutils/Makefile
@@ -12,9 +12,7 @@ MAINTAINER=	makoto%ki.nu@localhost
 HOMEPAGE=	http://www.cygwin.com/
 COMMENT=	GNU binutils ported to Win32/Cygwin environment
 
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_CROSSBASE=		yes
 USE_TOOLS+=		pax
 INFO_FILES=		yes
 
diff --git a/cygwin/Makefile.common b/cygwin/Makefile.common
index 10faa4f..ac1df7b 100644
--- a/cygwin/Makefile.common
+++ b/cygwin/Makefile.common
@@ -6,26 +6,25 @@
 
 .if !defined(CYGWIN_MAKEFILECOMMON)
 CYGWIN_MAKEFILECOMMON=	# yes
-USE_CROSSBASE=		yes
 
 CYGWIN_TARGET?=		i386--cygwin
 PLIST_SUBST+=		CYGWIN_TARGET=${CYGWIN_TARGET:Q}
 MAKE_ENV+=		CYGWIN_TARGET=${CYGWIN_TARGET:Q}
 CONFIGURE_ENV+=		CYGWIN_TARGET=${CYGWIN_TARGET:Q}
 
-BUILD_DEFS+=		CROSSBASE
-PATH:=			${CROSSBASE}/bin:${PATH}
+PATH:=			${PREFIX}/cross/bin:${PATH}
 
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS=		# reset
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-GNU_CONFIGURE_LIBDIR=	${PREFIX}/${CYGWIN_TARGET:Q}/lib
-GNU_CONFIGURE_INFODIR=	${PREFIX}/${CYGWIN_TARGET:Q}/info
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/${CYGWIN_TARGET:Q}/share
-#ONFIGURE_ARGS+=	--mandir=${PREFIX}/${CYGWIN_TARGET:Q}/man
-CONFIGURE_ARGS+=	--exec-prefix=${PREFIX:Q}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
+GNU_CONFIGURE_LIBDIR=	${PREFIX}/cross/${CYGWIN_TARGET:Q}/lib
+GNU_CONFIGURE_INFODIR=	${PREFIX}/cross/${CYGWIN_TARGET:Q}/info
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/cross/${CYGWIN_TARGET:Q}/share
+#ONFIGURE_ARGS+=	--mandir=${PREFIX}/cross/${CYGWIN_TARGET:Q}/man
+CONFIGURE_ARGS+=	--exec-prefix=${PREFIX:Q}/cross
 CONFIGURE_ARGS+=	--target=${CYGWIN_TARGET:Q}
 # following line to avoid getting
 #    make: exec(i386--netbsdelf-ar) failed (No such file or directory)


Home | Main Index | Thread Index | Old Index