aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2010-10-27 10:01:23 +0000
committerLeonardo Arena <rnalrd@gmail.com>2010-10-27 10:01:23 +0000
commit9d8faa1b93d7045a7869a7f00eefd387c7064698 (patch)
tree74037883f80a2120870a3fdfc1209d70280185b9
parent99345acd4e8411263c6cc0b1ef262f851daae477 (diff)
parent7116a2dbbca77f28246e6050f43e48041a901405 (diff)
downloadalpine_aports-9d8faa1b93d7045a7869a7f00eefd387c7064698.tar.bz2
alpine_aports-9d8faa1b93d7045a7869a7f00eefd387c7064698.tar.xz
alpine_aports-9d8faa1b93d7045a7869a7f00eefd387c7064698.zip
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports
-rw-r--r--main/lua-imlib2/APKBUILD (renamed from testing/lua-imlib2/APKBUILD)3
-rw-r--r--main/lua-nixio/APKBUILD (renamed from testing/lua-nixio/APKBUILD)0
-rw-r--r--main/lua-rex/APKBUILD (renamed from testing/lua-rex/APKBUILD)5
3 files changed, 3 insertions, 5 deletions
diff --git a/testing/lua-imlib2/APKBUILD b/main/lua-imlib2/APKBUILD
index 4b8cea2f4e..6e95117757 100644
--- a/testing/lua-imlib2/APKBUILD
+++ b/main/lua-imlib2/APKBUILD
@@ -1,5 +1,4 @@
1# Contributor: 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2# Maintainer:
3pkgname=lua-imlib2 2pkgname=lua-imlib2
4pkgver=0.1 3pkgver=0.1
5pkgrel=0 4pkgrel=0
diff --git a/testing/lua-nixio/APKBUILD b/main/lua-nixio/APKBUILD
index 9a900dfb08..9a900dfb08 100644
--- a/testing/lua-nixio/APKBUILD
+++ b/main/lua-nixio/APKBUILD
diff --git a/testing/lua-rex/APKBUILD b/main/lua-rex/APKBUILD
index 4f7bce0891..04fb749703 100644
--- a/testing/lua-rex/APKBUILD
+++ b/main/lua-rex/APKBUILD
@@ -1,5 +1,4 @@
1# Contributor: 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2# Maintainer:
3pkgname=lua-rex 2pkgname=lua-rex
4pkgver=2.4.0 3pkgver=2.4.0
5pkgrel=1 4pkgrel=1
@@ -16,7 +15,7 @@ _builddir="$srcdir"/lrexlib-$pkgver
16 15
17prepare() { 16prepare() {
18 cd "$_builddir" 17 cd "$_builddir"
19 sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS/" src/defaults.mak 18 sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS -fPIC/" src/defaults.mak
20 sed -i -e "s/^LD .*/LD = gcc/" \ 19 sed -i -e "s/^LD .*/LD = gcc/" \
21 src/common.mak 20 src/common.mak
22} 21}