Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Sun, 16 May 2021 01:17:00 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id 6PqvF1tyoGCDHgAALHnFKQ
	(envelope-from <akluth@marmoria-city>)
	for <mlmmj-tyndur-devel>; Sun, 16 May 2021 01:16:11 +0000
Delivered-To: tyndur-devel@tyndur.org
X-Spam: yes
X-Spam-Score: 10.7 / 150
X-Spam-Status: Yes, score=10.700 required=150.000
	tests=[ARC_NA=0.000, ASN=0.000, DMARC_POLICY_QUARANTINE=1.500
	FORGED_SENDER=0.300, FROM_HAS_DN=0.000, FROM_NEQ_ENVFROM=0.000
	HFILTER_FROMHOST_NOT_FQDN=3.000, HFILTER_HELO_5=3.000
	MID_CONTAINS_FROM=1.000, MIME_GOOD=-0.100, MIME_TRACE=0.000
	PREVIOUSLY_DELIVERED=0.000, RBL_SPAMHAUS_PBL=2.000
	RCPT_COUNT_TWO=0.000, RCVD_COUNT_TWO=0.000, RCVD_TLS_LAST=0.000
	RECEIVED_SPAMHAUS_PBL=0.000, R_DKIM_NA=0.000, R_SPF_NA=0.000
	TO_DN_SOME=0.000, TO_MATCH_ENVRCPT_SOME=0.000]
Received: from marmoria-city (mue-88-130-50-225.dsl.tropolys.de [88.130.50.225])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 633bf538 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Sun, 16 May 2021 01:16:10 +0000 (UTC)
Received: from marmoria-city (localhost [127.0.0.1])
	by marmoria-city (8.15.2/8.15.2/Debian-20) with ESMTP id 14G1GAaP081841;
	Sat, 15 May 2021 18:16:10 -0700
Received: (from akluth@localhost)
	by marmoria-city (8.15.2/8.15.2/Submit) id 14G1GATq081568;
	Sat, 15 May 2021 18:16:10 -0700
From: Alexander Kluth <alex@quackiquacki.org>
To: tyndur-devel@tyndur.org
Cc: Alexander Kluth <alex@quackiquacki.org>
Subject: [PATCH] build_crosstools: make-Bauen fixen
Date: Sat, 15 May 2021 18:15:09 -0700
Message-Id: <20210516011509.81477-1-alex@quackiquacki.org>
X-Mailer: git-send-email 2.30.2
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

! make 3.18 ist doch schon etwas in die Tage gekommen, darum musste
durch Hinzufuegen von zwei #defines fuer alloca und stat dafuer
gesorgt werden, dass make durchbaut.

Signed-off-by: Alexander Kluth <alex@quackiquacki.org>
---
 patches/make/3.81/make-3.81.patch | 20 ++++++++++++++++++++
 scripts/build_crosstools          | 17 +++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 patches/make/3.81/make-3.81.patch

diff --git a/patches/make/3.81/make-3.81.patch b/patches/make/3.81/make-3.81.patch
new file mode 100644
index 0000000..f7ff76b
--- /dev/null
+++ b/patches/make/3.81/make-3.81.patch
@@ -0,0 +1,20 @@
+--- glob/glob.c	2006-03-09 18:20:45.000000000 -0800
++++ ../make-3.81-patched/glob/glob.c	2021-05-15 17:33:41.308937803 -0700
+@@ -230,6 +230,8 @@
+ 
+ #endif
+ 
++#define __alloca(x)  __builtin_alloca(x)
++
+ #ifndef __GNU_LIBRARY__
+ # define __stat stat
+ # ifdef STAT_MACROS_BROKEN
+@@ -240,6 +242,8 @@
+ # endif
+ #endif
+ 
++#define __stat stat
++
+ #ifdef _LIBC
+ # undef strdup
+ # define strdup(str) __strdup (str)
diff --git a/scripts/build_crosstools b/scripts/build_crosstools
index d537bdb..5d0de08 100755
--- a/scripts/build_crosstools
+++ b/scripts/build_crosstools
@@ -17,6 +17,7 @@ MPFR_VERSION=3.1.5
 MPC_VERSION=0.8.2
 FPC_VERSION=2.4.0
 FASM_VERSION=1.69.31
+MAKE_VERSION=3.81
 
 PREFIX=`pwd`/env
 TARGET=i386-pc-tyndur
@@ -212,20 +213,24 @@ fi
 #
 if [ ! -f $TMP/make/build/bin/make ]; then
 
-rm -rf ${TMP}/make/make-3.81
+rm -rf ${TMP}/make/make-${MAKE_VERSION}
 cd ${TMP}/make
-echo "[make] Verion 3.81"
+echo "[make] Version ${MAKE_VERSION}"
 echo "[make] Herunterladen..."
 
-[ -f make-3.81.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/make/make-3.81.tar.bz2 || die "Fehler beim Herrunterladen."
+[ -f make-${MAKE_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/make/make-${MAKE_VERSION}.tar.bz2 || die "Fehler beim Herunterladen."
 echo "[make] Entpacken..."
-tar -xvf make-3.81.tar.bz2 &>>${LOGS}/make.log || die "Fehler beim Entpacken.\nSiehe tmp/make.log für Details."
+tar -xvf make-${MAKE_VERSION}.tar.bz2 &>>${LOGS}/make.log || die "Fehler beim Entpacken.\nSiehe tmp/make.log für Details."
+
+# make patchen & bauen
+echo "[make] Patch anwenden..."
+patch -p0 -d make-${MAKE_VERSION}/ < ${PATCHES}/make/${MAKE_VERSION}/make-${MAKE_VERSION}.patch >${LOGS}/make.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/make.log für Details."
 echo "[make] Konfigurieren"
-cd make-3.81
+cd make-${MAKE_VERSION}
 ./configure --prefix=${TMP}/make/build &>>${LOGS}/make.log || die "Fehler beim Konfigurieren.\nSiehe tmp/make.log für Details."
 echo "[make] Kompilieren"
 make &>>${LOGS}/make.log || die "Fehler beim Kompilieren.\nSiehe tmp/make.log für Details."
-echo "[make] Installieren."
+echo "[make] Installieren"
 make install &>>${LOGS}/make.log || die "Fehler beim Installieren.\nSiehe tmp/make.log für Details."
 echo -e "[make] Fertig.\n"
 fi
-- 
2.30.2

