From 49b46005e7f7ebebcf6b43d451918c5462ac28d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Sun, 19 Nov 2017 14:21:25 +0000
Subject: vars/{build,env}.vars: diet, pt. II. vars/build.vars: install w/
 `DESTDIR=<prefix> PREFIX= prefix=' by default. vars/build.vars:cmake: build
 w/ -g0 -O2. vars/cmake.vars: build using cmake_host. vars/pkgconf_host.vars:
 remove & don't install ${PREFIX}/bin/pkg-config link to avoid confusing host
 packages. vars/{apr_util,chainport}.vars: replaced w/ corresponding
 ${PKG_BUILD_STEPS}. patches/perl-5.22.1.local.patch: pass -L. -lperl when
 linking. patches/smallbasic.local.patch: don't call pcre-config.
 subr/pkg_autoconf.subr, vars/{lib{caca,udns},toilet}.vars: always install
 config.sub after bootstrap. subr/pkg_disabled.subr: always silently finish
 disabled packages. subr/pkg_setup_{env,vars}.subr: split.
 subr/pkg_{build,install}.subr: always pass LIBTOOL=${PKG_SLIBTOOL:=slibtool}.
 subr/pkg_{{build,work}_dir,extract,setup_env}.subr: infer ${PKG_BUILD_DIR}
 from ${PKG_SUBDIR} given the absence of configure{,.{ac,in}}.

---
 patches/perl-5.22.1.local.patch |  2 +-
 patches/smallbasic.local.patch  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 patches/smallbasic.local.patch

(limited to 'patches')

diff --git a/patches/perl-5.22.1.local.patch b/patches/perl-5.22.1.local.patch
index 65fe7e6a..2113c540 100644
--- a/patches/perl-5.22.1.local.patch
+++ b/patches/perl-5.22.1.local.patch
@@ -22,7 +22,7 @@ diff -ru perl-5.22.1.orig/Makefile perl-5.22.1/Makefile
  	$(eval extlibs=$(shell cat ext.libs))
  	$(eval statars=$(shell cat static.list))
 -	$(CC) $(LDFLAGS) -o $@ $(filter %$o,$^) $(LIBPERL) $(statars) $(LIBS) $(extlibs)
-+	$(CC) $(LDFLAGS) -o $@ $(filter %$o,$^) -lperl $(statars) $(LIBS) $(extlibs)
++	$(CC) $(LDFLAGS) -o $@ $(filter %$o,$^) -L. -lperl $(statars) $(LIBS) $(extlibs)
  
  %$o: %.c config.h
  	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/patches/smallbasic.local.patch b/patches/smallbasic.local.patch
new file mode 100644
index 00000000..e92e5b02
--- /dev/null
+++ b/patches/smallbasic.local.patch
@@ -0,0 +1,11 @@
+--- SmallBASIC/configure.orig	2017-11-20 01:35:25.276000000 +0000
++++ SmallBASIC/configure	2017-11-20 01:37:03.332000000 +0000
+@@ -5171,7 +5171,7 @@
+ 
+ $as_echo "#define USE_PCRE 1" >>confdefs.h
+ 
+-     PACKAGE_LIBS="${PACKAGE_LIBS} `pcre-config --libs`"
++     PACKAGE_LIBS="${PACKAGE_LIBS} ${PCRE_LIBS}"
+    fi
+ }
+ 
-- 
cgit v1.2.3