From ced0fad7eddb52a4c80c58cf610fcbd7defd3e9f Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Thu, 22 Jul 2010 12:36:06 +0000 Subject: Master Makefile: added cleanold target --- Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 67eb3daae..a85a3ff56 100644 --- a/Makefile +++ b/Makefile @@ -16,28 +16,28 @@ non-free-pkgs := $(shell ./aport.lua deplist $(rootdir) non-free) unstable-pkgs := $(shell ./aport.lua deplist $(rootdir) unstable) -main: +main: for p in $(main-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -testing: +testing: for p in $(testing-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -non-free: +non-free: for p in $(non-free-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -unstable: +unstable: for p in $(unstable-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ @@ -51,6 +51,12 @@ clean: abuild cleanpkg; \ done +cleanold: + for p in $(all-pkgs) ; do \ + cd $(rootdir)/$$p; \ + abuild cleanoldpkg; \ + done + fetch: for p in $(all-pkgs) ; do \ cd $(rootdir)/$$p; \ -- cgit v1.2.3 From d135d0bcf985282f2b600f7c8a5fabadb5d454a6 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 27 Jul 2010 15:27:42 +0000 Subject: testing/lua-rex: renamed directory to match package name, from lua-rexlib to lua-rex. --- testing/lua-rex/APKBUILD | 47 +++++++++++++++++++++++++++++++++++++++++++++ testing/lua-rexlib/APKBUILD | 47 --------------------------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 testing/lua-rex/APKBUILD delete mode 100644 testing/lua-rexlib/APKBUILD diff --git a/testing/lua-rex/APKBUILD b/testing/lua-rex/APKBUILD new file mode 100644 index 000000000..4f7bce089 --- /dev/null +++ b/testing/lua-rex/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: +# Maintainer: +pkgname=lua-rex +pkgver=2.4.0 +pkgrel=1 +pkgdesc="Lua bindings to regular expression library pcre and posix" +url="http://lrexlib.luaforge.net/" +license="MIT" +depends="lua-rex-pcre lua-rex-posix" +makedepends="pcre-dev lua-dev" +install= +subpackages="$pkgname-pcre $pkgname-posix" +source="http://luaforge.net/frs/download.php/3599/lrexlib-$pkgver.zip" + +_builddir="$srcdir"/lrexlib-$pkgver + +prepare() { + cd "$_builddir" + sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS/" src/defaults.mak + sed -i -e "s/^LD .*/LD = gcc/" \ + src/common.mak +} + +build() { + cd "$_builddir" + make -j1 build_pcre build_posix +} + +package() { + mkdir -p "$pkgdir" +} + +pcre() { + pkgdesc="Lua bindings to pcre regular expressions library" + cd "$_builddir" + install -d "$subpkgdir"/usr/lib/lua/5.1 + cp -a src/pcre/rex_pcre.so* "$subpkgdir"/usr/lib/lua/5.1 +} + +posix() { + pkgdesc="Lua bindings to posix regular expressions library" + cd "$_builddir" + install -d "$subpkgdir"/usr/lib/lua/5.1 + cp -a src/posix/rex_posix.so* "$subpkgdir"/usr/lib/lua/5.1 +} + +md5sums="c75d4164ac5036219eac87b488ded9b7 lrexlib-2.4.0.zip" diff --git a/testing/lua-rexlib/APKBUILD b/testing/lua-rexlib/APKBUILD deleted file mode 100644 index 4f7bce089..000000000 --- a/testing/lua-rexlib/APKBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=lua-rex -pkgver=2.4.0 -pkgrel=1 -pkgdesc="Lua bindings to regular expression library pcre and posix" -url="http://lrexlib.luaforge.net/" -license="MIT" -depends="lua-rex-pcre lua-rex-posix" -makedepends="pcre-dev lua-dev" -install= -subpackages="$pkgname-pcre $pkgname-posix" -source="http://luaforge.net/frs/download.php/3599/lrexlib-$pkgver.zip" - -_builddir="$srcdir"/lrexlib-$pkgver - -prepare() { - cd "$_builddir" - sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS/" src/defaults.mak - sed -i -e "s/^LD .*/LD = gcc/" \ - src/common.mak -} - -build() { - cd "$_builddir" - make -j1 build_pcre build_posix -} - -package() { - mkdir -p "$pkgdir" -} - -pcre() { - pkgdesc="Lua bindings to pcre regular expressions library" - cd "$_builddir" - install -d "$subpkgdir"/usr/lib/lua/5.1 - cp -a src/pcre/rex_pcre.so* "$subpkgdir"/usr/lib/lua/5.1 -} - -posix() { - pkgdesc="Lua bindings to posix regular expressions library" - cd "$_builddir" - install -d "$subpkgdir"/usr/lib/lua/5.1 - cp -a src/posix/rex_posix.so* "$subpkgdir"/usr/lib/lua/5.1 -} - -md5sums="c75d4164ac5036219eac87b488ded9b7 lrexlib-2.4.0.zip" -- cgit v1.2.3 From 3273b9c4910463eed14b2f547f46b6bc8eee4ebf Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 1 Aug 2010 11:30:24 +0000 Subject: main/pango: Removed explicit mv command in dev function. The explicit move failed, causing the build to fail, because the rename had already been done by abuild's default_dev function. Bumped the release, since the previous abuild/APKBUILD combination could not have worked, so other things might have changed. --- main/pango/APKBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD index af0acb401..4ef60fefb 100644 --- a/main/pango/APKBUILD +++ b/main/pango/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=pango pkgver=1.28.1 -pkgrel=0 +pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.pango.org/" license="LGPL" @@ -30,7 +30,6 @@ package() { dev() { default_dev install -d "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ } md5sums="bab5b4eb3fde6b0a5bfe98d25e668741 pango-1.28.1.tar.bz2" -- cgit v1.2.3 From 60b2a00006b281336d49ae0c72700e02c006c443 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 1 Aug 2010 11:43:21 +0000 Subject: main/gtk+: Removed explicit mv command in dev function. The explicit mv failed, causing the build to fail, because the rename had already been done by abuild's default_dev function. Bumped the release, since the previous abuild/APKBUILD combination could not have worked, so other things might have changed. --- main/gtk+/APKBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD index 07fba13cc..733f52a72 100644 --- a/main/gtk+/APKBUILD +++ b/main/gtk+/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=gtk+ pkgver=2.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" @@ -54,7 +54,6 @@ package() { dev() { default_dev install -d "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ } md5sums="53e6f3a93bd22934878fc4a4a34c68aa gtk+-2.20.1.tar.bz2" -- cgit v1.2.3 From f3eb155dab5d8de075f99dee8bfe7a8bb750732c Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sun, 1 Aug 2010 11:52:14 +0000 Subject: build process: Added debug flag to rebuild-alpine.sh script. Added debug flag to preserve build logs for packages that succeed, as well as report installed packages before and after each build. --- rebuild-alpine.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh index 20756bd9a..b5d72f92b 100755 --- a/rebuild-alpine.sh +++ b/rebuild-alpine.sh @@ -26,9 +26,14 @@ build () { pkgno=$(expr "$pkgno" + 1) echo "Building $p ($pkgno of $pktcnt in $1 - $failed failed)" cd $rootdir/$1/$p + if [ -n "$debug" ] ; then + apk info | sort > $rootdir/packages.$1.$pkgno.$p.before + fi abuild -rm > $rootdir/$1_$p.txt 2>&1 if [ "$?" = "0" ] ; then - rm $rootdir/$1_$p.txt + if [ -z "$debug" ] ; then + rm $rootdir/$1_$p.txt + fi else echo "Package $1/$p failed to build (output in $rootdir/$1_$p.txt)" if [ -n "$mail" ] ; then @@ -46,6 +51,9 @@ build () { fi failed=$(expr "$failed" + 1) fi + if [ -n "$debug" ] ; then + apk info | sort > $rootdir/packages.$1.$pkgno.$p.after + fi done cd $rootdir } @@ -54,10 +62,11 @@ touch START_OF_BUILD.txt unset clean unset mail -while getopts "cm" opt; do +while getopts "cmd" opt; do case $opt in 'c') clean="--clean";; 'm') mail="--mail";; + 'd') debug="--debug";; esac done -- cgit v1.2.3 From 36702cc274d58139bd3bf07f50fb1ee27af1b17a Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Thu, 5 Aug 2010 01:58:44 +0000 Subject: main/icu: Updated file version from 4_2_1 to 4_4_1 Update source archive file name from 4_2_1 to 4_4_1, to match release version, and because old source archive is no longer available on project website. --- main/icu/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD index 1d20de66d..4d29f7a42 100644 --- a/main/icu/APKBUILD +++ b/main/icu/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa pkgname=icu pkgver=4.4.1 -_ver=4_2_1 -pkgrel=2 +_ver=4_4_1 +pkgrel=3 pkgdesc="International Components for Unicode library" url="http://www.icu-project.org/" license="custom:icu" @@ -28,4 +28,4 @@ package() { install -Dm644 "$srcdir"/icu/license.html \ "$pkgdir"/usr/share/licenses/icu/license.html } -md5sums="e3738abd0d3ce1870dc1fd1f22bba5b1 icu4c-4_2_1-src.tgz" +md5sums="b6bc0a1153540b2088f8b03e0ba625d3 icu4c-4_4_1-src.tgz" -- cgit v1.2.3 From 0266df440d9a30b67fc04545c852e5156a724ad0 Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 02:33:47 +0000 Subject: main/fluxbox: Added freetype-dev as a make dependency Added freetype-dev as a make dependency to resolve a linkage error, looking for freetype.so. --- main/fluxbox/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD index dce038f72..c07dbdddf 100644 --- a/main/fluxbox/APKBUILD +++ b/main/fluxbox/APKBUILD @@ -8,7 +8,7 @@ license="MIT" subpackages="$pkgname-doc" depends= makedepends="pkgconfig libxinerama-dev libxpm-dev libxrandr imlib2-dev - libxrender-dev libxrandr-dev libxinerama-dev" + libxrender-dev libxrandr-dev libxinerama-dev freetype-dev" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" build () { -- cgit v1.2.3 From 3f687a9001b51d7b1968b51704bf4e1785379c87 Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 02:37:40 +0000 Subject: main/screen: Added ncurses-dev as a make dependency. Added ncurses-dev as a make dependency to resolve a linkage error, looking for ncurses.so. --- main/screen/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD index 6b08e5fad..c5ab5f9f1 100644 --- a/main/screen/APKBUILD +++ b/main/screen/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: pkgname=screen pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" license="GPL" depends= -makedepends="" +makedepends="ncurses-dev" install= subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/screen/$pkgname-$pkgver.tar.gz -- cgit v1.2.3 From 2e935c3d16e279aabb347c9c32b62f05bbaf8e8f Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 03:34:50 +0000 Subject: main/fluxbox: Bumped release level to reflect new dependencies. Bumped the release level from 2 to 3 to reflect the change in the make dependencies. (I thought I had fixed this with an --amend, but apparently not!) --- main/fluxbox/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD index c07dbdddf..caa80f4db 100644 --- a/main/fluxbox/APKBUILD +++ b/main/fluxbox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=fluxbox pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" license="MIT" -- cgit v1.2.3 From b7a97caf4b16951bee1afbc6b5b87926ba13a2f3 Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 03:37:59 +0000 Subject: main/terminal: Added ncurses-dev as a make dependency. Added ncurses-dev as a make dependency to resolve a linkage error, looking for ncurses.so. --- main/terminal/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD index 620d3535d..147c03dae 100644 --- a/main/terminal/APKBUILD +++ b/main/terminal/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa pkgname=terminal pkgver=0.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" url="http://www.xfce.org/projects/terminal/" license="GPL-2" subpackages="$pkgname-doc" depends="startup-notification hicolor-icon-theme" makedepends="pkgconfig exo-dev vte-dev dbus-glib-dev gettext-dev libiconv-dev - intltool" + intltool ncurses-dev" install= source="http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2 " -- cgit v1.2.3 From 5bd01bb6e408759f58fa1e920d329b11d522134d Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 03:40:38 +0000 Subject: main/vsftpd: Changed libcap-dev from an excluded make dependency to a required one. Changed libcap-dev from an excluded make dependency to a required one, to resolve a linkage error. The exclusion dates back to when the package was in testing, and the version has been advanced since then. I don't know why libcap was excluded. Before this change is adopted some more research is required. --- main/vsftpd/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index a7b78362d..7473a911f 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Natanael Copa pkgname=vsftpd pkgver=2.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" license="GPL" depends= -makedepends="openssl-dev !libcap-dev" +makedepends="openssl-dev libcap-dev" subpackages="$pkgname-doc" source="ftp://vsftpd.beasts.org/users/cevans/vsftpd-${pkgver}.tar.gz vsftpd-enable-ssl.patch -- cgit v1.2.3 From be84b7bd5f4da040966861737a5ee9acdd65c28b Mon Sep 17 00:00:00 2001 From: Linux User Date: Sun, 8 Aug 2010 03:50:39 +0000 Subject: testing/multipath-tools: Added ncurses-dev as a make dependency. Added ncurses-dev as a make dependency to resolve a linkage error, looking for ncurses.so. --- testing/multipath-tools/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/multipath-tools/APKBUILD b/testing/multipath-tools/APKBUILD index 471d9de2c..bb6227f93 100644 --- a/testing/multipath-tools/APKBUILD +++ b/testing/multipath-tools/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Leonardo Arena pkgname="multipath-tools" pkgver=0.4.8 -pkgrel=2 +pkgrel=3 pkgdesc="Device Mapper Multipathing Driver" url="http://christophe.varoqui.free.fr/" license="GPL" depends= -makedepends="lvm2-dev libaio-dev readline-dev" +makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev" install= subpackages="$pkgname-doc" source="http://christophe.varoqui.free.fr/$pkgname/$pkgname-$pkgver.tar.bz2 -- cgit v1.2.3 From 4dd2915b6b1d725e701acd6dae9040cd4e0a7ca6 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Fri, 13 Aug 2010 14:04:10 +0000 Subject: main/gmp5: Modified subpackages to remove redundant :dev Modified development subpackage name to remove the redundant :dev (-dev already suffixed) which confuses the dependency analyzer script (aports.lua). --- main/gmp5/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD index e07bff62c..1bbf41f4c 100644 --- a/main/gmp5/APKBUILD +++ b/main/gmp5/APKBUILD @@ -9,7 +9,7 @@ url="http://gmplib.org/" license="LGPL3" makedepends="m4 texinfo" depends= -subpackages="$pkgname-doc gmp-dev:dev" +subpackages="$pkgname-doc gmp-dev" source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 gmp-4.1.4-noexecstack.patch " @@ -17,7 +17,7 @@ source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 _builddir="$srcdir"/$_name-$pkgver build() { cd "$_builddir" - patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 + patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 ABI="32" ./configure --prefix=/usr \ --build=${CHOST} \ -- cgit v1.2.3 From 3feb2747624921c5d5b50910180a15e0641787e3 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Fri, 13 Aug 2010 14:08:16 +0000 Subject: main/mpfr3: Modified subpackages to remove redundant :dev Modified development subpackage name to remove the redundant :dev (already has -dev suffix) which confuses the dependency analyzer script (aports.lua). --- main/mpfr3/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/mpfr3/APKBUILD b/main/mpfr3/APKBUILD index 31d912402..d7c4aa6a3 100644 --- a/main/mpfr3/APKBUILD +++ b/main/mpfr3/APKBUILD @@ -8,7 +8,7 @@ license="GPL LGPL" depends= makedepends="gmp-dev texinfo" source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" -subpackages="$pkgname-doc mpfr-dev:dev" +subpackages="$pkgname-doc mpfr-dev" _builddir="$srcdir"/mpfr-$pkgver build() { -- cgit v1.2.3 From 2772d73a7b1cadcd5cf821fe822d9babf75d4b5d Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 7 Sep 2010 13:43:18 +0000 Subject: main/poppler: Added libiconv-dev as a make dependency. In APKBUILD added libiconv-dev as a make dependency. --- main/poppler/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD index 7b9c8935d..e766477ac 100644 --- a/main/poppler/APKBUILD +++ b/main/poppler/APKBUILD @@ -5,12 +5,12 @@ # So we build gtk support in poppler-gtk pkgname=poppler pkgver=0.14.0 -pkgrel=0 +pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" license="GPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig" +makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig libiconv-dev" depends= depends_dev="cairo-dev" source="http://$pkgname.freedesktop.org/$pkgname-$pkgver.tar.gz" -- cgit v1.2.3 From 46a8276904fb4ab54491cc4b7d70449f0db6ddb8 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 7 Sep 2010 17:07:37 +0000 Subject: main/xorg-server: Added zlib-dev as a make dependency. Added zlib-dev to APKBUILD as a make dependency. --- main/xorg-server/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 2ae98aba2..8f22a6b2f 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=xorg-server pkgver=1.7.7 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" @@ -25,7 +25,8 @@ makedepends=" libxxf86misc-dev openssl-dev pixman-dev - + zlib-dev + bigreqsproto compositeproto damageproto -- cgit v1.2.3 From 8c642cce9d87fb03f46d9ac3e57fb520cd586cff Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Sat, 11 Sep 2010 14:35:59 +0000 Subject: release.sh: Fixed mail flags for cc recipients. Fixed mail flags for cc recipients in the event of failed builds. Flag had been mistakenly set to -c instead of -cc. --- rebuild-alpine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh index b5d72f92b..24ce9d47b 100755 --- a/rebuild-alpine.sh +++ b/rebuild-alpine.sh @@ -39,7 +39,7 @@ build () { if [ -n "$mail" ] ; then maintainer=$(grep Maintainer APKBUILD | cut -d " " -f 3-) if [ -n "$maintainer" ] ; then - recipients="$maintainer -c dev@lists.alpinelinux.org" + recipients="$maintainer -cc dev@lists.alpinelinux.org" else recipients="dev@lists.alpinelinux.org" fi -- cgit v1.2.3 From 8124b5490d23d0349efefa8aa49d0ca6b1e4e375 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 14 Sep 2010 22:09:21 +0000 Subject: main/gcc: Added objc package to build. Added the build of the Objective-C libraries to the build, and created the objc subpackage. This has been tested with a simple "Hello World" program, but more thorough testing is necessary. --- main/gcc/APKBUILD | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index da7f66248..5dc287321 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -6,15 +6,16 @@ _specsver=0.1.7 _espfver=0.3.6 _uclibc_abiver=0.9.32 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" license="GPL LGPL" depends="binutils libgcc libgomp" makedepends="bison flex gmp-dev mpfr-dev texinfo" -subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp" +subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp objc" source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 http://weaver.gentooenterprise.com/hardened/patches/gcc-$_pv-espf-$_espfver.tar.bz2 http://weaver.gentooenterprise.com/hardened/patches/gcc-$_pv-specs-$_specsver.tar.bz2 gcc-spec-env.patch @@ -23,13 +24,14 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 gcc-dynamic-linker.patch PR32219.patch " -# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 +# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 1 + build () { cd "$srcdir"/gcc-$pkgver # ESPF patches. we dont use objc yet - rm -f ../espf-gcc-$_pv/*_objc*lang-specs*.patch + #rm -f ../espf-gcc-$_pv/*_objc*lang-specs*.patch # thanks to Zorry for hard work on those patches for i in ../espf-gcc-$_pv/*.patch; do msg "Applying $i" @@ -60,7 +62,7 @@ build () --enable-__cxa_atexit \ --enable-cld \ --enable-espf \ - --enable-languages=c,c++ \ + --enable-languages=c,c++,objc \ --enable-shared \ --enable-target-optspace \ --enable-tls \ @@ -81,7 +83,7 @@ package() { # binutils provides libiberty.a rm -f "$pkgdir"/usr/lib/libiberty.a - + # install the specs cd "$srcdir"/specs install -d "$pkgdir"/usr/share/gcc @@ -112,13 +114,20 @@ gpp() { mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/ } +objc() { + pkgdesc="GNU ObjectiveC library" + mkdir -p "$subpkgdir"/usr/lib + + mv "$pkgdir"/usr/lib/*objc* "$subpkgdir"/usr/lib/ +} + libgcc() { pkgdesc="GNU C compiler runtime libraries" depends= mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libgcc_s.so.* "$subpkgdir"/usr/lib/ } - + libgomp() { pkgdesc="GCC shared-memory parallel programming API library" depends= @@ -129,6 +138,7 @@ libgomp() { md5sums="eb68755f64b9a4e37751992abb41c4fc gcc-core-4.4.4.tar.bz2 d51a6ec3eac1a90e7fc280d976ce7f80 gcc-g++-4.4.4.tar.bz2 +871cdd1a1ed8806a9bd5afcef0938fef gcc-objc-4.4.4.tar.bz2 72643cf4f9751d6cbfdbce483b92461d gcc-4.4.2-espf-0.3.6.tar.bz2 528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2 c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch -- cgit v1.2.3