From fe4e7fa28fa0b247cb1a5a22ecaa29d3b0b37e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Mon, 17 Jun 2019 08:29:12 +0000 Subject: patches/smallbasic_pre.local.patch: don't use non-portable <<< in configure script. --- patches/smallbasic_pre.local.patch | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'patches/smallbasic_pre.local.patch') diff --git a/patches/smallbasic_pre.local.patch b/patches/smallbasic_pre.local.patch index 63e85d23..d5a6461d 100644 --- a/patches/smallbasic_pre.local.patch +++ b/patches/smallbasic_pre.local.patch @@ -1,6 +1,17 @@ -diff -ru SmallBASIC.orig/configure.ac SmallBASIC/configure.ac ---- SmallBASIC.orig/configure.ac 2018-08-18 15:58:59.300508539 +0200 -+++ SmallBASIC/configure.ac 2018-08-18 16:04:05.394415143 +0200 +diff -ru SmallBASIC.orig/src/platform/console/main.cpp SmallBASIC/src/platform/console/main.cpp +--- SmallBASIC.orig/src/platform/console/main.cpp 2018-08-18 15:58:59.324509172 +0200 ++++ SmallBASIC/src/platform/console/main.cpp 2018-08-18 16:04:21.506628434 +0200 +@@ -332,7 +332,7 @@ + return gsb_last_error ? gsb_last_line : 0; + } + +-#if defined(__GNUC__) && !defined(__MACH__) && !defined(_Win32) ++#if defined(__GLIBC__) && !defined(__MACH__) && !defined(_Win32) + // for analysing excessive malloc calls using kdbg + extern "C" void *__libc_malloc(size_t size); + void *malloc(size_t size) { +--- SmallBASIC/configure.ac.orig 2019-04-26 18:35:43.668000000 +0000 ++++ SmallBASIC/configure.ac 2019-06-17 08:27:43.108000000 +0000 @@ -117,7 +117,7 @@ if test "${have_pcre}" = "yes" ; then @@ -10,7 +21,7 @@ diff -ru SmallBASIC.orig/configure.ac SmallBASIC/configure.ac fi } -@@ -325,7 +325,7 @@ +@@ -337,12 +337,12 @@ checkProfiling checkForWindows @@ -19,15 +30,9 @@ diff -ru SmallBASIC.orig/configure.ac SmallBASIC/configure.ac PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result" BUILD_DATE=`date +"%a, %d %b %Y"` AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date]) -diff -ru SmallBASIC.orig/src/platform/console/main.cpp SmallBASIC/src/platform/console/main.cpp ---- SmallBASIC.orig/src/platform/console/main.cpp 2018-08-18 15:58:59.324509172 +0200 -+++ SmallBASIC/src/platform/console/main.cpp 2018-08-18 16:04:21.506628434 +0200 -@@ -332,7 +332,7 @@ - return gsb_last_error ? gsb_last_line : 0; - } --#if defined(__GNUC__) && !defined(__MACH__) && !defined(_Win32) -+#if defined(__GLIBC__) && !defined(__MACH__) && !defined(_Win32) - // for analysing excessive malloc calls using kdbg - extern "C" void *__libc_malloc(size_t size); - void *malloc(size_t size) { +-SB_DWORD_VER=`awk -F "." '{printf "0x%02d%02d%02d", $1,$2,$3}' <<< ${PACKAGE_VERSION}` ++SB_DWORD_VER=`echo "${PACKAGE_VERSION}" | awk -F "." '{printf "0x%02d%02d%02d", $1,$2,$3}'` + AC_DEFINE_UNQUOTED([SB_DWORD_VER],[$SB_DWORD_VER],[SB_DWORD_VER]) + + AC_SUBST(PACKAGE_CFLAGS) -- cgit v1.2.3