diff options
author | joerg <joerg@pkgsrc.org> | 2013-12-08 22:31:53 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-12-08 22:31:53 +0000 |
commit | 438f6eb818711f4b4207358fbb31e998ebfe3f98 (patch) | |
tree | 45fe46fbf5f87939aa0d6a8a2320e133fb36a92f /devel | |
parent | b99b106084e72ee4672bb66866338fb3408ab3c4 (diff) | |
download | pkgsrc-438f6eb818711f4b4207358fbb31e998ebfe3f98.tar.gz |
Don't let the installation path of libiberty.a depend on the multi-os
settings of the system compiler.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/sdcc3/distinfo | 3 | ||||
-rw-r--r-- | devel/sdcc3/patches/patch-support_sdbinutils_libiberty_Makefile.in | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/devel/sdcc3/distinfo b/devel/sdcc3/distinfo index 4296ce3860e..51e3a66d13f 100644 --- a/devel/sdcc3/distinfo +++ b/devel/sdcc3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2013/10/26 23:24:40 joerg Exp $ +$NetBSD: distinfo,v 1.3 2013/12/08 22:31:53 joerg Exp $ SHA1 (sdcc-src-3.3.0.tar.bz2) = beed1b8c73f13344e018f48b1563ff2a948b70cf RMD160 (sdcc-src-3.3.0.tar.bz2) = 464b5aae6242e0da0181e9050b52949ae176de00 @@ -16,3 +16,4 @@ SHA1 (patch-support_makebin_Makefile_in) = 6045bc4a0870b57f74c597b4a6215bf3accd1 SHA1 (patch-support_scripts_Makefile.in) = f292001be4a7dc0a629529087838138e1bb52161 SHA1 (patch-support_sdbinutils_Makefile.in) = 5d8fce39c55d44340a6431426aa01690e39b7c67 SHA1 (patch-support_sdbinutils_bfd_asxxxx.c) = 3163003fec4ea548dc89ce35ef0e9b7ed53c67f9 +SHA1 (patch-support_sdbinutils_libiberty_Makefile.in) = b651a34581964f8a1053ce4cd3da353f6a227d3c diff --git a/devel/sdcc3/patches/patch-support_sdbinutils_libiberty_Makefile.in b/devel/sdcc3/patches/patch-support_sdbinutils_libiberty_Makefile.in new file mode 100644 index 00000000000..d9a5af2cb0c --- /dev/null +++ b/devel/sdcc3/patches/patch-support_sdbinutils_libiberty_Makefile.in @@ -0,0 +1,36 @@ +$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 |