aboutsummaryrefslogtreecommitdiffstats
path: root/community/wxgtk
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-08-29 01:02:44 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2016-08-29 13:30:50 +0000
commit347df81939c6a90347e4bb45bd79f61fd279c146 (patch)
tree9fe7851d98ba233f3d87640ee20d6d451abd451f /community/wxgtk
parent1b89bbae418febbb77f1e75305e90afc2c766f25 (diff)
downloadaports-347df81939c6a90347e4bb45bd79f61fd279c146.tar.bz2
aports-347df81939c6a90347e4bb45bd79f61fd279c146.tar.xz
community/wxgtk: correctly update config sub
Diffstat (limited to 'community/wxgtk')
-rw-r--r--community/wxgtk/APKBUILD9
-rw-r--r--community/wxgtk/config-allow-musl.patch21
2 files changed, 5 insertions, 25 deletions
diff --git a/community/wxgtk/APKBUILD b/community/wxgtk/APKBUILD
index 7148a5c44b..5f156e6447 100644
--- a/community/wxgtk/APKBUILD
+++ b/community/wxgtk/APKBUILD
@@ -15,11 +15,15 @@ makedepends="$depends_dev glu-dev sdl-dev gst-plugins-base0.10-dev
install=""
subpackages="$pkgname-dev $pkgname-lang $pkgname-media $pkgname-base"
source="https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2
- config-allow-musl.patch
gcc6.patch"
builddir="$srcdir/wxWidgets-$pkgver"
+prepare() {
+ default_prepare || return 1
+ update_config_sub || return 1
+}
+
build() {
cd "$builddir"
./configure \
@@ -69,11 +73,8 @@ base() {
}
md5sums="ba4cd1f3853d0cd49134c5ae028ad080 wxWidgets-3.0.2.tar.bz2
-4e830ce35be68f904b80c34093153350 config-allow-musl.patch
f624f8a0c1163a1376d43f5b57c5f39a gcc6.patch"
sha256sums="346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d wxWidgets-3.0.2.tar.bz2
-0517cf79f2d2bdc9132e5da2e4717f37b002bf09de77ee5dbe7a46447dee92cb config-allow-musl.patch
6e659eb4f1cfbfe31e0da0c8719e496e16efa5be36265388a639964e4b39cf78 gcc6.patch"
sha512sums="098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 wxWidgets-3.0.2.tar.bz2
-dbe80fbf36afe26bbec66d93842ae849eb29e33d05b762f7eb90f933db7bd415ff174a18c9acb7e71221e9ca9fd70c0c3cebe1fd0f77f348182ddb1a640b4f62 config-allow-musl.patch
6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585 gcc6.patch"
diff --git a/community/wxgtk/config-allow-musl.patch b/community/wxgtk/config-allow-musl.patch
deleted file mode 100644
index 8e471e11ef..0000000000
--- a/community/wxgtk/config-allow-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- wxWidgets-3.0.2/config.sub
-+++ config.sub
-@@ -125,7 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+ linux-uclibc* | linux-musl* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1352,6 +1352,9 @@
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
-+ -linux-musl)
-+ os=-linux-musl
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;