diff options
| author | joerg <joerg> | 2013-12-08 22:31:53 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-12-08 22:31:53 +0000 |
| commit | 4ae40a8ede27f35c7ab5b14bc9f7d666f6cd687a (patch) | |
| tree | 45fe46fbf5f87939aa0d6a8a2320e133fb36a92f /cross/nios2-binutils | |
| parent | 9f30afd2f830fdae0f2d554461152c64205be5d1 (diff) | |
| download | pkgsrc-4ae40a8ede27f35c7ab5b14bc9f7d666f6cd687a.tar.gz | |
Don't let the installation path of libiberty.a depend on the multi-os
settings of the system compiler.
Diffstat (limited to 'cross/nios2-binutils')
| -rw-r--r-- | cross/nios2-binutils/distinfo | 3 | ||||
| -rw-r--r-- | cross/nios2-binutils/patches/patch-libiberty_Makefile.in | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/cross/nios2-binutils/distinfo b/cross/nios2-binutils/distinfo index 72e46458904..7e18c11aa5b 100644 --- a/cross/nios2-binutils/distinfo +++ b/cross/nios2-binutils/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $ +$NetBSD: distinfo,v 1.4 2013/12/08 22:31:54 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-libiberty_Makefile.in) = 1e446461751d036eec91110fa094bf4fbbfee128 diff --git a/cross/nios2-binutils/patches/patch-libiberty_Makefile.in b/cross/nios2-binutils/patches/patch-libiberty_Makefile.in new file mode 100644 index 00000000000..99143fedc6a --- /dev/null +++ b/cross/nios2-binutils/patches/patch-libiberty_Makefile.in @@ -0,0 +1,36 @@ +$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 |