Merge remote-tracking branch 'ms/x86_64' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
1  2 
lfs/glibc
lfs/postfix
make.sh

diff --combined lfs/glibc
+++ b/lfs/glibc
@@@ -285,12 -285,12 +285,13 @@@ endi
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1183533.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1207995.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1209375.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1217186.patch
  
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch
  
        # Fixes:
        #   Makefile:235: *** mixed implicit and normal rules.  Stop.
@@@ -305,10 -305,15 +306,15 @@@ ifeq "$(ROOT)" "
  ifeq "$(MACHINE_TYPE)" "arm"
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
                scripts/test-installation.pl
+ else
+ ifeq "$(MACHINE)" "x86_64"
+       cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 -o|' \
+               scripts/test-installation.pl
  else
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
                scripts/test-installation.pl
  endif
+ endif
  endif
  
        cd $(DIR_SRC)/glibc-build && \
@@@ -338,6 -343,8 +344,8 @@@ ifeq "$(ROOT)" "
  
        # Timezone data will be shipped by tzdata.
        rm -rfv /usr/share/zoneinfo
+ else
+       ln -svf lib /tools/lib64
  endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)
diff --combined lfs/postfix
@@@ -32,11 -32,11 +32,11 @@@ DL_FROM    = $(URL_IPFIRE
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = postfix
 -PAK_VER    = 8
 +PAK_VER    = 9
  
  DEPS       = "amavisd mysql"
  
- CCARGS     = -DNO_IPV6 `getconf LFS_CFLAGS` \
+ CCARGS     = `getconf LFS_CFLAGS` \
        -DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
        -DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
  AUXLIBS    =
@@@ -115,6 -115,5 +115,6 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
  
        install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \
                         /var/ipfire/backup/addons/includes/postfix
 +      mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --combined make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
 -CORE="93"                                                     # Core Level (Filename)
 +CORE="94"                                                     # Core Level (Filename)
  PAKFIRE_CORE="93"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -245,6 -245,11 +245,11 @@@ prepareenv() 
  buildtoolchain() {
      local error=false
      case "${TARGET_ARCH}:${BUILD_ARCH}" in
+         # x86_64
+         x86_64:x86_64)
+              # This is working.
+              ;;
          # x86
          i586:i586|i586:i686|i586:x86_64)
              # These are working.
@@@ -413,6 -418,16 +418,16 @@@ buildipfire() 
    ipfiremake iptables
  
    case "${TARGET_ARCH}" in
+       x86_64)
+               ipfiremake linux                        KCFG=""
+               ipfiremake backports                    KCFG=""
+               ipfiremake cryptodev                    KCFG=""
+               ipfiremake e1000e                       KCFG=""
+ #             ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
+               ipfiremake xtables-addons               KCFG=""
+               ipfiremake linux-initrd                 KCFG=""
+               ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
    ipfiremake screen
    ipfiremake smartmontools
    ipfiremake htop
 +  ipfiremake chkconfig
    ipfiremake postfix
    ipfiremake fetchmail
    ipfiremake cyrus-imapd
    ipfiremake clamav
    ipfiremake spamassassin
    ipfiremake amavisd
 +  ipfiremake dma
    ipfiremake alsa
    ipfiremake mpfire
    ipfiremake guardian
    ipfiremake perl-Net-SMTP-SSL
    ipfiremake perl-MIME-Base64
    ipfiremake perl-Authen-SASL
 +  ipfiremake perl-MIME-Lite
 +  ipfiremake perl-Email-Date-Format
    ipfiremake git
    ipfiremake squidclamav
    ipfiremake vnstat