Changeset 98117


Ignore:
Timestamp:
Sep 25, 2012, 1:16:38 PM (12 years ago)
Author:
raimue@…
Message:

devel/elftoolchain:
Update to version 0.6.1, fix incorrect symlinks in libexec/elftoolchain/,
updated patches also fix #36313

Location:
trunk/dports/devel/elftoolchain
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/devel/elftoolchain/Portfile

    r96252 r98117  
    44
    55name            elftoolchain
    6 version         0.5.1
     6version         0.6.1
    77categories      devel
    88platforms       darwin
    … …  
    1919use_bzip2 yes
    2020
    21 checksums       rmd160  4be0adf8349c764474810e23cfb022c655002d77 \
    22                 sha256  b34351b26503ce7f106426d926a87e6c6adef81e324ec7052f3e09108ae7ab81
     21checksums       rmd160  4268371905cb6e1741371cfb957bf8a7cb04ce18 \
     22                sha256  a3e0c11ed9b0fe2f40b687b11849e7d52cb6675ebc60745c85d37a3ae4272cab
    2323
    2424depends_build   port:bsdmake \
    … …  
    2929
    3030patchfiles      patch-mk.diff \
    31                 patch-disable-tests.diff \
    3231                patch-libelf-config.diff \
    3332                patch-common-elftc.diff \
    … …  
    7170# Add elftc- prefix to all binaries to avoid conflicts
    7271post-destroot {
    73     foreach f [glob ${destroot}${prefix}/bin/*] {
    74         set nf [file dirname $f]/elftc-[file tail $f]
    75         move $f $nf
    76         ln -s $nf ${destroot}${prefix}/libexec/${name}/[file tail $f]
     72    foreach f [glob -tails -directory ${destroot}${prefix}/bin *] {
     73        set nf elftc-$f
     74        move ${destroot}${prefix}/bin/$f ${destroot}${prefix}/bin/$nf
     75        ln -s ${prefix}/bin/$nf ${destroot}${prefix}/libexec/${name}/$f
    7776    }
    7877    foreach f [glob ${destroot}${prefix}/share/man/man{1,5}/*] {

  • trunk/dports/devel/elftoolchain/files/patch-byteorder-macros.diff

    r96252 r98117  
    1 --- ar/write.c  2012-02-25 00:59:04.000000000 +0100
    2 +++ ar/write.c  2012-02-25 00:59:16.000000000 +0100
     1--- ar/write.c  2012-04-24 04:33:40.000000000 +0200
     2+++ ar/write.c  2012-09-25 11:27:38.000000000 +0200
     3@@ -43,6 +43,11 @@
     4 
     5 ELFTC_VCSID("$Id: write.c 2496 2012-04-24 02:33:40Z jkoshy $");
     6 
     7+#ifdef __APPLE__
     8+#include <libkern/OSByteOrder.h>
     9+#define htobe32(x) OSSwapHostToBigInt32(x)
     10+#endif
     11+
     12 #define _ARMAG_LEN 8           /* length of the magic string */
     13 #define _ARHDR_LEN 60          /* length of the archive header */
     14 #define _INIT_AS_CAP 128       /* initial archive string table size */
     15--- elfcopy/archive.c   2012-02-25 01:00:13.000000000 +0100
     16+++ elfcopy/archive.c   2012-02-25 01:00:27.000000000 +0100
    317@@ -42,6 +42,11 @@
    418 
    5  ELFTC_VCSID("$Id: write.c 2130 2011-11-10 06:56:46Z jkoshy $");
     19 ELFTC_VCSID("$Id: archive.c 2370 2011-12-29 12:48:12Z jkoshy $");
    620 
    721+#ifdef __APPLE__
    … …  
    1327 #define _ARHDR_LEN 60          /* length of ar header */
    1428 #define _INIT_AS_CAP 128       /* initial archive string table size */
    15 --- elfcopy/archive.c   2012-02-25 01:00:13.000000000 +0100
    16 +++ elfcopy/archive.c   2012-02-25 01:00:27.000000000 +0100
    17 @@ -43,6 +43,11 @@
    18  
    19  ELFTC_VCSID("$Id: archive.c 2126 2011-11-10 05:07:18Z jkoshy $");
    20  
    21 +#ifdef __APPLE__
    22 +#include <libkern/OSByteOrder.h>
    23 +#define htobe32(x) OSSwapHostToBigInt32(x)
    24 +#endif
    25 +
    26  #define _ARMAG_LEN 8           /* length of ar magic string */
    27  #define _ARHDR_LEN 60          /* length of ar header */
    28  #define _INIT_AS_CAP 128       /* initial archive string table size */

  • trunk/dports/devel/elftoolchain/files/patch-common-elftc.diff

    r96252 r98117  
    1 --- common/_elftc.h     2012-02-25 00:00:07.000000000 +0100
    2 +++ common/_elftc.h     2012-02-25 00:11:26.000000000 +0100
    3 @@ -89,6 +89,10 @@
    4  #define        ELFTC_VCSID(ID)         __RCSID(ID)
     1--- common/_elftc.h     2012-04-23 07:31:56.000000000 +0200
     2+++ common/_elftc.h     2012-09-25 11:17:20.000000000 +0200
     3@@ -244,6 +244,10 @@
     4 #endif /* __GNUC__ */
    55 #endif
    66 
    … …  
    1212 
    1313 /*
    14 @@ -97,7 +101,7 @@
     14@@ -252,8 +256,8 @@
    1515 
    1616 #ifndef        ELFTC_GETPROGNAME
    1717 
    18 -#if defined(__FreeBSD__) || defined(__NetBSD__)
    19 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
     18-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__minix) || \
     19-    defined(__NetBSD__)
     20+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
     21+    defined(__minix) || defined(__NetBSD__)
    2022 
    2123 #include <stdlib.h>
    2224 
    23 @@ -173,4 +177,20 @@
    24  #define        ELFTC_BROKEN_YY_NO_INPUT                1
    25  #endif /* __NetBSD __ */
     25@@ -384,4 +388,20 @@
     26 
     27 #endif /* __OpenBSD__ */
    2628 
    2729+

  • trunk/dports/devel/elftoolchain/files/patch-libelf-config.diff

    r96252 r98117  
    1 --- libelf/_libelf_config.h     2011-10-23 11:07:00.000000000 +0200
    2 +++ libelf/_libelf_config.h     2012-02-24 23:54:10.000000000 +0100
    3 @@ -149,3 +149,26 @@
    4  #define        roundup2        roundup
     1--- libelf/_libelf_config.h     2011-12-04 07:45:47.000000000 +0100
     2+++ libelf/_libelf_config.h     2012-09-25 11:01:26.000000000 +0200
     3@@ -175,3 +175,26 @@
     4 #endif
    55 
    66 #endif /* defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) */

  • trunk/dports/devel/elftoolchain/files/patch-mk.diff

    r96252 r98117  
    1 --- mk/elftoolchain.inc.mk      2012-02-24 23:30:51.000000000 +0100
    2 +++ mk/elftoolchain.inc.mk      2012-02-24 23:32:03.000000000 +0100
    3 @@ -11,7 +11,7 @@
     1--- mk/elftoolchain.inc.mk.orig 2012-09-25 14:56:23.000000000 +0200
     2+++ mk/elftoolchain.inc.mk      2012-09-25 14:57:39.000000000 +0200
     3@@ -11,8 +11,8 @@
    44 
    55 .include <bsd.own.mk>
    66 
    7 -.if ${OS_HOST} == "FreeBSD"
    8 +.if ${OS_HOST} == Darwin || ${OS_HOST} == FreeBSD
     7-.if ${OS_HOST} == "DragonFly" || ${OS_HOST} == "FreeBSD" || \
     8-       ${OS_HOST} == "OpenBSD"
     9+.if ${OS_HOST} == "Darwin" || ${OS_HOST} == "DragonFly" || \
     10+       ${OS_HOST} == "FreeBSD" || ${OS_HOST} == "OpenBSD"
    911 # Simulate <bsd.inc.mk>.
    1012 .PHONY:                incinstall
    1113 includes:      ${INCS} incinstall
    12 --- mk/elftoolchain.subdir.mk   2012-02-25 01:46:53.000000000 +0100
    13 +++ mk/elftoolchain.subdir.mk   2012-02-25 01:47:40.000000000 +0100
    14 @@ -6,7 +6,7 @@
     14@@ -23,6 +23,11 @@
     15        cmp -s $> $@ > /dev/null 2>&1 || \
     16                ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} $> $@
     17 .endfor
     18+# Add rule for target install which is missing for common/Makefile
     19+.if ${OS_HOST} == "Darwin"
     20+.PHONY:        install
     21+install:       incinstall
     22+.endif
     23 .else
     24 # Use the standard <bsd.inc.mk>.
     25 .include <bsd.inc.mk>
     26--- mk/elftoolchain.subdir.mk   2011-12-04 09:09:17.000000000 +0100
     27+++ mk/elftoolchain.subdir.mk   2012-09-25 10:57:24.000000000 +0200
     28@@ -8,7 +8,7 @@
    1529 
    16  .include "$(TOP)/mk/elftoolchain.os.mk"
    17  
    18 -.if ${OS_HOST} == FreeBSD
    19 +.if ${OS_HOST} == Darwin || ${OS_HOST} == FreeBSD
     30 .if ${OS_HOST} == DragonFly
     31 clobber test:: _SUBDIR
     32-.elif ${OS_HOST} == FreeBSD
     33+.elif ${OS_HOST} == FreeBSD || ${OS_HOST} == Darwin
    2034 SUBDIR_TARGETS+=       clobber test
    21  .else
    22  TARGETS+=      clobber test
    23 --- common/Makefile     2012-02-25 02:09:41.000000000 +0100
    24 +++ common/Makefile     2012-02-25 02:09:58.000000000 +0100
    25 @@ -5,9 +5,9 @@
    26  INCS=  elfdefinitions.h
    27  INCSDIR?=      /usr/include
    28  
    29 -.PHONY:        all clean clobber depend obj
    30 +.PHONY:        all clean install clobber depend obj
    31  
    32 -all depend obj:
    33 +all install depend obj:
    34  
    35  clean clobber:
    36         rm -f ${CLEANFILES}
     35 .elif ${OS_HOST} == OpenBSD
     36 clobber test:: _SUBDIRUSE
    3737--- mk/elftoolchain.prog.mk     2012-03-10 13:03:40.000000000 +0100
    3838+++ mk/elftoolchain.prog.mk     2012-03-10 13:04:46.000000000 +0100
Note: See TracChangeset for help on using the changeset viewer.