summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-01-20 19:28:46 +0000
committerjoerg <joerg@pkgsrc.org>2014-01-20 19:28:46 +0000
commit0c01b328bcd8498135d1a57402580d9e77f9cc20 (patch)
treef2305a8eefe0aed6c939468e128671767eeb1136 /cross
parent2f9455bb9f5d79628cca15aae15a57893530a040 (diff)
downloadpkgsrc-0c01b328bcd8498135d1a57402580d9e77f9cc20.tar.gz
Apply libiberty patch here too.
Diffstat (limited to 'cross')
-rw-r--r--cross/nios2-gcc/distinfo3
-rw-r--r--cross/nios2-gcc/patches/patch-libiberty_Makefile.in36
2 files changed, 38 insertions, 1 deletions
diff --git a/cross/nios2-gcc/distinfo b/cross/nios2-gcc/distinfo
index 3307012ad00..bcf82af21d2 100644
--- a/cross/nios2-gcc/distinfo
+++ b/cross/nios2-gcc/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $
+$NetBSD: distinfo,v 1.4 2014/01/20 19:28:46 joerg Exp $
SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b
RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f
Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes
SHA1 (patch-aa) = a5c69ac3c3768c90d70665a308a155c584b68e60
SHA1 (patch-gcc_doc_invoke.texi) = 649bc208f3c516263888d5431dc9cba890f53498
+SHA1 (patch-libiberty_Makefile.in) = 3ccf5055f59b6420a698c0230a65ec37f78ea8e1
diff --git a/cross/nios2-gcc/patches/patch-libiberty_Makefile.in b/cross/nios2-gcc/patches/patch-libiberty_Makefile.in
new file mode 100644
index 00000000000..de40f58182f
--- /dev/null
+++ b/cross/nios2-gcc/patches/patch-libiberty_Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-libiberty_Makefile.in,v 1.1 2014/01/20 19:28:46 joerg Exp $
+
+--- libiberty/Makefile.in.orig 2013-06-25 21:01:31.000000000 +0000
++++ libiberty/Makefile.in
+@@ -351,12 +351,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};; \
+@@ -370,10 +369,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