Changeset 98735

Timestamp:

Oct 14, 2012, 2:37:17 AM (12 years ago)

Author:

landonf@…

Message:

Install libiberty and libbfd in a target-specific directory, rather than disabling their installation outright. This allows for their use by other ports (such as simulavr, which requires the avr-binutils libiberty and libbfd).
I've verified that this works with all ports that use the crossbinutils port group.

File:

• trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl (modified) (2 diffs)

trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl

@@ -103 +103 @@
         }
 
-        # Do not install libiberty
-        reinplace {/^install:/s/ .*//} ${worksrcpath}/libiberty/Makefile.in
+        # Install target-compatible libbfd/libiberty in the target's directory
+        reinplace "s|bfdlibdir=.*|bfdlibdir='${prefix}/${crossbinutils.target}/host/lib'|g" \
+                ${worksrcpath}/bfd/configure                                \
+                ${worksrcpath}/opcodes/configure
+        reinplace "s|bfdincludedir=.*|bfdincludedir='${prefix}/${crossbinutils.target}/host/include'|g"  \
+                ${worksrcpath}/bfd/configure                                             \
+                ${worksrcpath}/opcodes/configure
+
+        reinplace "s|\$(libdir)|\"${prefix}/${crossbinutils.target}/host/lib\"|g" \
+                ${worksrcpath}/libiberty/Makefile.in
+        reinplace "s|\$(MULTIOSDIR)||g" \
+                ${worksrcpath}/libiberty/Makefile.in
     }
 
@@ -118 +128 @@
     configure.args \
         --target=${target} \
-        --program-prefix=${target}-
+        --program-prefix=${target}- \
+        --enable-install-libiberty \
+        --enable-install-libbfd
 
     build.dir ${workpath}/build