diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2013-01-04 19:57:47 +0100 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2013-01-04 19:57:47 +0100 |
| commit | 07fde5952c6e30618cce88f7164c849b5bf394a7 (patch) | |
| tree | b7b45a58f252c0656bbd83ca05ada5c5f952519e | |
| parent | b422f38a66c95e40a9e01bab6642962441f2e786 (diff) | |
| download | aports-07fde5952c6e30618cce88f7164c849b5bf394a7.tar.bz2 aports-07fde5952c6e30618cce88f7164c849b5bf394a7.tar.xz | |
main/awesome: fix build on eglibc
| -rw-r--r-- | main/awesome/APKBUILD | 6 | ||||
| -rw-r--r-- | main/awesome/iconv.patch | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/main/awesome/APKBUILD b/main/awesome/APKBUILD index 02f08d24e..aac648cfa 100644 --- a/main/awesome/APKBUILD +++ b/main/awesome/APKBUILD @@ -15,7 +15,6 @@ makedepends="lua-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev install="" subpackages="$pkgname-doc" source="http://awesome.naquadah.org/download/${pkgname}-${pkgver}.tar.xz - iconv.patch " _srcdir="${srcdir}/${pkgname}-${pkgver}" @@ -33,9 +32,11 @@ prepare() { build() { mkdir "$_builddir" cd "$_builddir" + [ "$ALPINE_LIBC" != "eglibc" ] && local _iconv="-liconv" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc \ -DCMAKE_BUILD_TYPE=Release \ + -DAWESOME_OPTIONAL_LDFLAGS=$_iconv \ "$_srcdir" make || return 1 } @@ -45,5 +46,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="8449fde51c08ca69fe4c5bb831b3c618 awesome-3.4.13.tar.xz -78d1ab9037c1dae956ffe239083596a2 iconv.patch" +md5sums="8449fde51c08ca69fe4c5bb831b3c618 awesome-3.4.13.tar.xz" diff --git a/main/awesome/iconv.patch b/main/awesome/iconv.patch deleted file mode 100644 index 3f6030024..000000000 --- a/main/awesome/iconv.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./CMakeLists.txt.orig -+++ ./CMakeLists.txt -@@ -99,6 +99,7 @@ - LINK_FLAGS -export-dynamic) - - target_link_libraries(${PROJECT_AWE_NAME} -+ -liconv - ${AWESOME_COMMON_REQUIRED_LDFLAGS} - ${AWESOME_REQUIRED_LDFLAGS} - ${AWESOME_OPTIONAL_LDFLAGS}) |