From a2d258f4ab557ef7561d324eb5af469d1a6de419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 22 Oct 2021 15:53:19 +0200
Subject: groups/221.native_packages_dev.group: drop smallbasic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 groups/221.native_packages_dev.group |  9 +--------
 patches/smallbasic_pre.local.patch   | 38 ------------------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 patches/smallbasic_pre.local.patch

diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index b58d477..961818d 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -4,7 +4,7 @@
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
 bison chicken cparser cssc diffutils flex gdb gengetopt indent lua lunix m4 make mandoc nasm
-patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")";
+patch patchutils perl posix_cc python2 python3 ruby sbsigntools tk")";
 : ${PKG_BISON_DEPENDS:="readline"};
 : ${PKG_BISON_SHA256SUM:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf};
 : ${PKG_BISON_VERSION:=3.7.6};
@@ -154,13 +154,6 @@ make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_SBSIGNTOOLS_URLS_GIT:=sbsigntools-master=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git@master};
 : ${PKG_SBSIGNTOOLS_SUBDIR:=sbsigntools-master};
 : ${PKG_SBSIGNTOOLS_IN_TREE:=1};
-: ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
-: ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
-: ${PKG_SMALLBASIC_CONFIG_CACHE_EXTRA:="
-ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
-ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"};
-: ${PKG_SMALLBASIC_IN_TREE:=1};
-: ${PKG_SMALLBASIC_DISABLED:=1};
 : ${PKG_TK_DEPENDS:="libX11 tcl"};
 : ${PKG_TK_SHA256SUM:=131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd};
 : ${PKG_TK_VERSION:=8.7a1};
diff --git a/patches/smallbasic_pre.local.patch b/patches/smallbasic_pre.local.patch
deleted file mode 100644
index d5a6461..0000000
--- a/patches/smallbasic_pre.local.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-      AC_DEFINE(USE_PCRE, 1, [match.c used with libpcre.])
--     PACKAGE_LIBS="${PACKAGE_LIBS} `pcre-config --libs`"
-+     PACKAGE_LIBS="${PACKAGE_LIBS} ${PCRE_LIBS}"
-    fi
- }
- 
-@@ -337,12 +337,12 @@
- checkProfiling
- checkForWindows
- 
--CFLAGS="${CFLAGS} -std=gnu11"
-+CFLAGS="${CFLAGS} -std=gnu99"
- PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
- BUILD_DATE=`date +"%a, %d %b %Y"`
- AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date])
- 
--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