Sun Dec 8 22:31:54 2013 UTC ()
Don't let the installation path of libiberty.a depend on the multi-os
settings of the system compiler.


(joerg)
diff -r1.1 -r1.2 pkgsrc/cross/freemint-gcc/distinfo
diff -r0 -r1.1 pkgsrc/cross/freemint-gcc/patches/patch-gcc-4.6.4_libiberty_Makefile.in
diff -r1.3 -r1.4 pkgsrc/cross/nios2-binutils/distinfo
diff -r0 -r1.1 pkgsrc/cross/nios2-binutils/patches/patch-libiberty_Makefile.in
diff -r1.2 -r1.3 pkgsrc/devel/sdcc3/distinfo
diff -r0 -r1.1 pkgsrc/devel/sdcc3/patches/patch-support_sdbinutils_libiberty_Makefile.in

cvs diff -r1.1 -r1.2 pkgsrc/cross/freemint-gcc/distinfo (expand / switch to unified diff)

--- pkgsrc/cross/freemint-gcc/distinfo 2013/09/12 14:07:18 1.1
+++ pkgsrc/cross/freemint-gcc/distinfo 2013/12/08 22:31:53 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.1 2013/09/12 14:07:18 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2013/12/08 22:31:53 joerg Exp $
2 2
3SHA1 (gcc-4.6.4-mint-20130415.patch.bz2) = bd2e88f2b862cc404f47144fb67375b1fe17291b 3SHA1 (gcc-4.6.4-mint-20130415.patch.bz2) = bd2e88f2b862cc404f47144fb67375b1fe17291b
4RMD160 (gcc-4.6.4-mint-20130415.patch.bz2) = d3cafafb1caa1a1eb915c5f15f4063d6a70ac4ee 4RMD160 (gcc-4.6.4-mint-20130415.patch.bz2) = d3cafafb1caa1a1eb915c5f15f4063d6a70ac4ee
5Size (gcc-4.6.4-mint-20130415.patch.bz2) = 11059 bytes 5Size (gcc-4.6.4-mint-20130415.patch.bz2) = 11059 bytes
6SHA1 (gcc-4.6.4.tar.bz2) = 63933a8a5cf725626585dbba993c8b0f6db1335d 6SHA1 (gcc-4.6.4.tar.bz2) = 63933a8a5cf725626585dbba993c8b0f6db1335d
7RMD160 (gcc-4.6.4.tar.bz2) = 6a58b053812cf75622bc4579e020cd9471f46916 7RMD160 (gcc-4.6.4.tar.bz2) = 6a58b053812cf75622bc4579e020cd9471f46916
8Size (gcc-4.6.4.tar.bz2) = 72006076 bytes 8Size (gcc-4.6.4.tar.bz2) = 72006076 bytes
9SHA1 (mintlib-CVS-20130415.tar.gz) = 7c6fe3e1e837b7e3e12bb8af4bdcb7b31234b557 9SHA1 (mintlib-CVS-20130415.tar.gz) = 7c6fe3e1e837b7e3e12bb8af4bdcb7b31234b557
10RMD160 (mintlib-CVS-20130415.tar.gz) = 873b551a70ba3500601d7c674735088fa6edbf8f 10RMD160 (mintlib-CVS-20130415.tar.gz) = 873b551a70ba3500601d7c674735088fa6edbf8f
11Size (mintlib-CVS-20130415.tar.gz) = 1881345 bytes 11Size (mintlib-CVS-20130415.tar.gz) = 1881345 bytes
12SHA1 (pml-2.03-mint-20110207.patch.bz2) = 45c39230860fa2300cdaa342dec6e9ff99376186 12SHA1 (pml-2.03-mint-20110207.patch.bz2) = 45c39230860fa2300cdaa342dec6e9ff99376186
13RMD160 (pml-2.03-mint-20110207.patch.bz2) = 314666dfc9e34865ab322d48385ddd9e8b87ad37 13RMD160 (pml-2.03-mint-20110207.patch.bz2) = 314666dfc9e34865ab322d48385ddd9e8b87ad37
14Size (pml-2.03-mint-20110207.patch.bz2) = 11230 bytes 14Size (pml-2.03-mint-20110207.patch.bz2) = 11230 bytes
15SHA1 (pml-2.03.tar.bz2) = 07b5c70a704b06e24d6a64e8b5333d98804aa178 15SHA1 (pml-2.03.tar.bz2) = 07b5c70a704b06e24d6a64e8b5333d98804aa178
16RMD160 (pml-2.03.tar.bz2) = 60a31723cb5078a2f889757e6a02b873b444ddb7 16RMD160 (pml-2.03.tar.bz2) = 60a31723cb5078a2f889757e6a02b873b444ddb7
17Size (pml-2.03.tar.bz2) = 52753 bytes 17Size (pml-2.03.tar.bz2) = 52753 bytes
 18SHA1 (patch-gcc-4.6.4_libiberty_Makefile.in) = 52bec2f3a21e1ff8f8614e43cbc541d585624dda

File Added: pkgsrc/cross/freemint-gcc/patches/patch-gcc-4.6.4_libiberty_Makefile.in
$NetBSD: patch-gcc-4.6.4_libiberty_Makefile.in,v 1.1 2013/12/08 22:31:54 joerg Exp $

--- gcc-4.6.4/libiberty/Makefile.in.orig	2013-12-08 17:16:03.000000000 +0000
+++ gcc-4.6.4/libiberty/Makefile.in
@@ -349,12 +349,11 @@ install-strip: install
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take CFLAGS into account as well,
 # since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
+	( cd $(DESTDIR)$(libdir) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB)
 	if test -n "${target_header_dir}"; then \
 	  case "${target_header_dir}" in \
 	    /*)    thd=${target_header_dir};; \
@@ -368,10 +367,10 @@ install_to_libdir: all
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 install_to_tooldir: all
-	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n
+	( cd $(DESTDIR)$(tooldir)/lib ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 # required-list was used when building a shared bfd/opcodes/libiberty

cvs diff -r1.3 -r1.4 pkgsrc/cross/nios2-binutils/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/cross/nios2-binutils/Attic/distinfo 2013/11/18 06:41:27 1.3
+++ pkgsrc/cross/nios2-binutils/Attic/distinfo 2013/12/08 22:31:54 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $ 1$NetBSD: distinfo,v 1.4 2013/12/08 22:31:54 joerg Exp $
2 2
3SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b 3SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b
4RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f 4RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f
5Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes 5Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes
 6SHA1 (patch-libiberty_Makefile.in) = 1e446461751d036eec91110fa094bf4fbbfee128

File Added: pkgsrc/cross/nios2-binutils/patches/Attic/patch-libiberty_Makefile.in
$NetBSD: patch-libiberty_Makefile.in,v 1.1 2013/12/08 22:31:54 joerg Exp $

--- libiberty/Makefile.in.orig	2013-12-08 15:46:44.000000000 +0000
+++ libiberty/Makefile.in
@@ -354,12 +354,11 @@ install-strip: install
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take CFLAGS into account as well,
 # since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
+	( cd $(DESTDIR)$(libdir) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB)
 	if test -n "${target_header_dir}"; then \
 	  case "${target_header_dir}" in \
 	    /*)    thd=${target_header_dir};; \
@@ -373,10 +372,10 @@ install_to_libdir: all
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 install_to_tooldir: all
-	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n
+	( cd $(DESTDIR)$(tooldir)/lib ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 # required-list was used when building a shared bfd/opcodes/libiberty

cvs diff -r1.2 -r1.3 pkgsrc/devel/sdcc3/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/sdcc3/distinfo 2013/10/26 23:24:40 1.2
+++ pkgsrc/devel/sdcc3/distinfo 2013/12/08 22:31:53 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.2 2013/10/26 23:24:40 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2013/12/08 22:31:53 joerg Exp $
2 2
3SHA1 (sdcc-src-3.3.0.tar.bz2) = beed1b8c73f13344e018f48b1563ff2a948b70cf 3SHA1 (sdcc-src-3.3.0.tar.bz2) = beed1b8c73f13344e018f48b1563ff2a948b70cf
4RMD160 (sdcc-src-3.3.0.tar.bz2) = 464b5aae6242e0da0181e9050b52949ae176de00 4RMD160 (sdcc-src-3.3.0.tar.bz2) = 464b5aae6242e0da0181e9050b52949ae176de00
5Size (sdcc-src-3.3.0.tar.bz2) = 9923501 bytes 5Size (sdcc-src-3.3.0.tar.bz2) = 9923501 bytes
6SHA1 (patch-Makefile_in) = 0a5fd582904d4f7dc991110758dbe136c35881aa 6SHA1 (patch-Makefile_in) = 0a5fd582904d4f7dc991110758dbe136c35881aa
7SHA1 (patch-aa) = d6e35a5676a9931716905c25f4f4a570557f79cf 7SHA1 (patch-aa) = d6e35a5676a9931716905c25f4f4a570557f79cf
8SHA1 (patch-device_non-free_lib_Makefile.in) = 402a4525afa7f78386ff07c158351b29588a00f6 8SHA1 (patch-device_non-free_lib_Makefile.in) = 402a4525afa7f78386ff07c158351b29588a00f6
9SHA1 (patch-device_non-free_lib_pic14_libdev_Makefile.in) = ea47981bcb6d7e2dea361b1d02371b07d2421c7c 9SHA1 (patch-device_non-free_lib_pic14_libdev_Makefile.in) = ea47981bcb6d7e2dea361b1d02371b07d2421c7c
10SHA1 (patch-doc_Makefile_in) = cbb9f7300dbd19032454253adf81eeb89bfb080a 10SHA1 (patch-doc_Makefile_in) = cbb9f7300dbd19032454253adf81eeb89bfb080a
11SHA1 (patch-sim_ucsim_cmd.src_Makefile.in) = d29c69af814d4404aba64328e69e93189220a49d 11SHA1 (patch-sim_ucsim_cmd.src_Makefile.in) = d29c69af814d4404aba64328e69e93189220a49d
12SHA1 (patch-sim_ucsim_doc_Makefile_in) = 781a8cf0a9eb3b5d6130e0621ef464a53b0086d6 12SHA1 (patch-sim_ucsim_doc_Makefile_in) = 781a8cf0a9eb3b5d6130e0621ef464a53b0086d6
13SHA1 (patch-sim_ucsim_sim.src_Makefile.in) = 2ad1a61fd9f21f6d767e0cb4e09aee1480a29000 13SHA1 (patch-sim_ucsim_sim.src_Makefile.in) = 2ad1a61fd9f21f6d767e0cb4e09aee1480a29000
14SHA1 (patch-support_cpp_Makefile.in) = 7bc2a33eb42afd18930ddaf6d75b981135fca36f 14SHA1 (patch-support_cpp_Makefile.in) = 7bc2a33eb42afd18930ddaf6d75b981135fca36f
15SHA1 (patch-support_makebin_Makefile_in) = 6045bc4a0870b57f74c597b4a6215bf3accd1a46 15SHA1 (patch-support_makebin_Makefile_in) = 6045bc4a0870b57f74c597b4a6215bf3accd1a46
16SHA1 (patch-support_scripts_Makefile.in) = f292001be4a7dc0a629529087838138e1bb52161 16SHA1 (patch-support_scripts_Makefile.in) = f292001be4a7dc0a629529087838138e1bb52161
17SHA1 (patch-support_sdbinutils_Makefile.in) = 5d8fce39c55d44340a6431426aa01690e39b7c67 17SHA1 (patch-support_sdbinutils_Makefile.in) = 5d8fce39c55d44340a6431426aa01690e39b7c67
18SHA1 (patch-support_sdbinutils_bfd_asxxxx.c) = 3163003fec4ea548dc89ce35ef0e9b7ed53c67f9 18SHA1 (patch-support_sdbinutils_bfd_asxxxx.c) = 3163003fec4ea548dc89ce35ef0e9b7ed53c67f9
 19SHA1 (patch-support_sdbinutils_libiberty_Makefile.in) = b651a34581964f8a1053ce4cd3da353f6a227d3c

File Added: pkgsrc/devel/sdcc3/patches/Attic/patch-support_sdbinutils_libiberty_Makefile.in
$NetBSD: patch-support_sdbinutils_libiberty_Makefile.in,v 1.1 2013/12/08 22:31:53 joerg Exp $

--- support/sdbinutils/libiberty/Makefile.in.orig	2012-11-05 13:26:25.000000000 +0000
+++ support/sdbinutils/libiberty/Makefile.in
@@ -451,12 +451,11 @@ install-strip: install
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take CFLAGS into account as well,
 # since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
+	( cd $(DESTDIR)$(libdir) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB)
 	if test -n "${target_header_dir}"; then \
 	  case "${target_header_dir}" in \
 	    /*)    thd=${target_header_dir};; \
@@ -470,10 +469,10 @@ install_to_libdir: all
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 install_to_tooldir: all
-	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
+	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n
+	( cd $(DESTDIR)$(tooldir)/lib ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 # required-list was used when building a shared bfd/opcodes/libiberty