summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
l---------313.libfirm.build (renamed from 313.libgcrypt.build)0
-rw-r--r--313.libfirm.vars10
l---------314.libgcrypt.build (renamed from 314.libksba.build)0
l---------315.libksba.build (renamed from 315.lua.build)0
l---------316.lua.build (renamed from 316.ncurses.build)0
l---------317.ncurses.build (renamed from 317.ncursestw.build)0
l---------318.ncursestw.build (renamed from 318.ncursesw.build)0
l---------319.ncursesw.build (renamed from 319.npth.build)0
-rw-r--r--319.ncursesw.vars (renamed from 318.ncursesw.vars)0
l---------320.npth.build (renamed from 320.xz.build)0
l---------321.xz.build (renamed from 404.cron.build)0
l---------404.cparser.build (renamed from 405.curl.build)0
-rw-r--r--404.cparser.vars15
l---------405.cron.build (renamed from 406.dash.build)0
l---------406.curl.build (renamed from 407.diffutils.build)0
l---------407.dash.build (renamed from 408.dos2unix.build)0
l---------408.diffutils.build (renamed from 409.ed.build)0
l---------409.dos2unix.build (renamed from 410.file.build)0
l---------410.ed.build (renamed from 411.findutils.build)0
l---------411.file.build (renamed from 412.gawk.build)0
l---------412.findutils.build (renamed from 413.git.build)0
l---------413.gawk.build (renamed from 414.gnupg.build)0
l---------414.git.build (renamed from 415.grep.build)0
l---------415.gnupg.build (renamed from 416.hexcurse.build)0
l---------416.grep.build (renamed from 417.htop.build)0
l---------417.hexcurse.build (renamed from 418.inetutils.build)0
l---------418.htop.build (renamed from 419.infounzip.build)0
l---------419.inetutils.build (renamed from 420.infozip.build)0
l---------420.infounzip.build (renamed from 421.irssi.build)0
l---------421.infozip.build (renamed from 422.john.build)0
l---------422.irssi.build (renamed from 423.less.build)0
l---------423.john.build (renamed from 424.lynx.build)0
l---------424.less.build (renamed from 425.man_db.build)0
l---------425.lynx.build (renamed from 426.make.build)0
l---------426.man_db.build (renamed from 427.mc.build)0
l---------427.make.build (renamed from 428.mksh.build)0
l---------428.mc.build (renamed from 429.nano.build)0
l---------429.mksh.build (renamed from 430.netcat.build)0
l---------430.nano.build (renamed from 431.openssh.build)0
l---------431.netcat.build (renamed from 432.p7zip.build)0
l---------432.openssh.build (renamed from 433.pacman.build)0
l---------433.p7zip.build (renamed from 434.patch.build)0
l---------434.pacman.build (renamed from 435.perl.build)0
l---------435.patch.build (renamed from 436.procps_ng.build)0
l---------436.perl.build (renamed from 437.python3.build)0
-rw-r--r--436.perl.vars (renamed from 435.perl.vars)0
l---------437.procps_ng.build (renamed from 438.rsync.build)0
l---------438.python3.build (renamed from 439.rxvt_unicode.build)0
-rw-r--r--438.python3.vars (renamed from 437.python3.vars)0
l---------439.rsync.build (renamed from 440.sed.build)0
l---------440.rxvt_unicode.build (renamed from 441.tar.build)0
l---------441.sed.build (renamed from 442.tcsh.build)0
l---------442.tar.build (renamed from 443.the_silver_searcher.build)0
l---------443.tcsh.build (renamed from 444.tmux.build)0
l---------444.the_silver_searcher.build (renamed from 445.util_linux.build)0
l---------445.tmux.build (renamed from 446.vim.build)0
l---------446.util_linux.build (renamed from 447.weechat.build)0
l---------447.vim.build (renamed from 448.which.build)0
l---------448.weechat.build (renamed from 449.whois.build)0
l---------449.which.build (renamed from 450.xeyes.build)0
l---------450.whois.build (renamed from 451.xwd.build)0
l---------451.xeyes.build (renamed from 452.zsh.build)0
l---------452.xwd.build1
l---------453.zsh.build1
-rw-r--r--README2
-rw-r--r--build.subr1
-rw-r--r--build.usage4
-rw-r--r--build.vars24
-rw-r--r--pkg.build13
69 files changed, 63 insertions, 8 deletions
diff --git a/313.libgcrypt.build b/313.libfirm.build
index 52bb82e5..52bb82e5 120000
--- a/313.libgcrypt.build
+++ b/313.libfirm.build
diff --git a/313.libfirm.vars b/313.libfirm.vars
new file mode 100644
index 00000000..5756b545
--- /dev/null
+++ b/313.libfirm.vars
@@ -0,0 +1,10 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_libfirm_fetch_post() {
+ fetch_git bfirm git://midipix.org/compilers/bfirm;
+ insecure_mkdir cparser+libfirm/sysroot cparser+libfirm/build/libfirm;
+};
+
+# vim:filetype=sh
diff --git a/314.libksba.build b/314.libgcrypt.build
index 52bb82e5..52bb82e5 120000
--- a/314.libksba.build
+++ b/314.libgcrypt.build
diff --git a/315.lua.build b/315.libksba.build
index 52bb82e5..52bb82e5 120000
--- a/315.lua.build
+++ b/315.libksba.build
diff --git a/316.ncurses.build b/316.lua.build
index 52bb82e5..52bb82e5 120000
--- a/316.ncurses.build
+++ b/316.lua.build
diff --git a/317.ncursestw.build b/317.ncurses.build
index 52bb82e5..52bb82e5 120000
--- a/317.ncursestw.build
+++ b/317.ncurses.build
diff --git a/318.ncursesw.build b/318.ncursestw.build
index 52bb82e5..52bb82e5 120000
--- a/318.ncursesw.build
+++ b/318.ncursestw.build
diff --git a/319.npth.build b/319.ncursesw.build
index 52bb82e5..52bb82e5 120000
--- a/319.npth.build
+++ b/319.ncursesw.build
diff --git a/318.ncursesw.vars b/319.ncursesw.vars
index 50024dec..50024dec 100644
--- a/318.ncursesw.vars
+++ b/319.ncursesw.vars
diff --git a/320.xz.build b/320.npth.build
index 52bb82e5..52bb82e5 120000
--- a/320.xz.build
+++ b/320.npth.build
diff --git a/404.cron.build b/321.xz.build
index 52bb82e5..52bb82e5 120000
--- a/404.cron.build
+++ b/321.xz.build
diff --git a/405.curl.build b/404.cparser.build
index 52bb82e5..52bb82e5 120000
--- a/405.curl.build
+++ b/404.cparser.build
diff --git a/404.cparser.vars b/404.cparser.vars
new file mode 100644
index 00000000..3126cd33
--- /dev/null
+++ b/404.cparser.vars
@@ -0,0 +1,15 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_cparser_fetch_post() {
+ fetch_git bcparser git://midipix.org/compilers/bcparser;
+ insecure_mkdir cparser+libfirm/sysroot cparser+libfirm/build/cparser;
+};
+
+pkg_cparser_configure_pre() {
+ export CFLAGS_PATH="-I../../sysroot/include";
+ export LDFLAGS_PATH="-L../../sysroot/lib";
+};
+
+# vim:filetype=sh
diff --git a/406.dash.build b/405.cron.build
index 52bb82e5..52bb82e5 120000
--- a/406.dash.build
+++ b/405.cron.build
diff --git a/407.diffutils.build b/406.curl.build
index 52bb82e5..52bb82e5 120000
--- a/407.diffutils.build
+++ b/406.curl.build
diff --git a/408.dos2unix.build b/407.dash.build
index 52bb82e5..52bb82e5 120000
--- a/408.dos2unix.build
+++ b/407.dash.build
diff --git a/409.ed.build b/408.diffutils.build
index 52bb82e5..52bb82e5 120000
--- a/409.ed.build
+++ b/408.diffutils.build
diff --git a/410.file.build b/409.dos2unix.build
index 52bb82e5..52bb82e5 120000
--- a/410.file.build
+++ b/409.dos2unix.build
diff --git a/411.findutils.build b/410.ed.build
index 52bb82e5..52bb82e5 120000
--- a/411.findutils.build
+++ b/410.ed.build
diff --git a/412.gawk.build b/411.file.build
index 52bb82e5..52bb82e5 120000
--- a/412.gawk.build
+++ b/411.file.build
diff --git a/413.git.build b/412.findutils.build
index 52bb82e5..52bb82e5 120000
--- a/413.git.build
+++ b/412.findutils.build
diff --git a/414.gnupg.build b/413.gawk.build
index 52bb82e5..52bb82e5 120000
--- a/414.gnupg.build
+++ b/413.gawk.build
diff --git a/415.grep.build b/414.git.build
index 52bb82e5..52bb82e5 120000
--- a/415.grep.build
+++ b/414.git.build
diff --git a/416.hexcurse.build b/415.gnupg.build
index 52bb82e5..52bb82e5 120000
--- a/416.hexcurse.build
+++ b/415.gnupg.build
diff --git a/417.htop.build b/416.grep.build
index 52bb82e5..52bb82e5 120000
--- a/417.htop.build
+++ b/416.grep.build
diff --git a/418.inetutils.build b/417.hexcurse.build
index 52bb82e5..52bb82e5 120000
--- a/418.inetutils.build
+++ b/417.hexcurse.build
diff --git a/419.infounzip.build b/418.htop.build
index 52bb82e5..52bb82e5 120000
--- a/419.infounzip.build
+++ b/418.htop.build
diff --git a/420.infozip.build b/419.inetutils.build
index 52bb82e5..52bb82e5 120000
--- a/420.infozip.build
+++ b/419.inetutils.build
diff --git a/421.irssi.build b/420.infounzip.build
index 52bb82e5..52bb82e5 120000
--- a/421.irssi.build
+++ b/420.infounzip.build
diff --git a/422.john.build b/421.infozip.build
index 52bb82e5..52bb82e5 120000
--- a/422.john.build
+++ b/421.infozip.build
diff --git a/423.less.build b/422.irssi.build
index 52bb82e5..52bb82e5 120000
--- a/423.less.build
+++ b/422.irssi.build
diff --git a/424.lynx.build b/423.john.build
index 52bb82e5..52bb82e5 120000
--- a/424.lynx.build
+++ b/423.john.build
diff --git a/425.man_db.build b/424.less.build
index 52bb82e5..52bb82e5 120000
--- a/425.man_db.build
+++ b/424.less.build
diff --git a/426.make.build b/425.lynx.build
index 52bb82e5..52bb82e5 120000
--- a/426.make.build
+++ b/425.lynx.build
diff --git a/427.mc.build b/426.man_db.build
index 52bb82e5..52bb82e5 120000
--- a/427.mc.build
+++ b/426.man_db.build
diff --git a/428.mksh.build b/427.make.build
index 52bb82e5..52bb82e5 120000
--- a/428.mksh.build
+++ b/427.make.build
diff --git a/429.nano.build b/428.mc.build
index 52bb82e5..52bb82e5 120000
--- a/429.nano.build
+++ b/428.mc.build
diff --git a/430.netcat.build b/429.mksh.build
index 52bb82e5..52bb82e5 120000
--- a/430.netcat.build
+++ b/429.mksh.build
diff --git a/431.openssh.build b/430.nano.build
index 52bb82e5..52bb82e5 120000
--- a/431.openssh.build
+++ b/430.nano.build
diff --git a/432.p7zip.build b/431.netcat.build
index 52bb82e5..52bb82e5 120000
--- a/432.p7zip.build
+++ b/431.netcat.build
diff --git a/433.pacman.build b/432.openssh.build
index 52bb82e5..52bb82e5 120000
--- a/433.pacman.build
+++ b/432.openssh.build
diff --git a/434.patch.build b/433.p7zip.build
index 52bb82e5..52bb82e5 120000
--- a/434.patch.build
+++ b/433.p7zip.build
diff --git a/435.perl.build b/434.pacman.build
index 52bb82e5..52bb82e5 120000
--- a/435.perl.build
+++ b/434.pacman.build
diff --git a/436.procps_ng.build b/435.patch.build
index 52bb82e5..52bb82e5 120000
--- a/436.procps_ng.build
+++ b/435.patch.build
diff --git a/437.python3.build b/436.perl.build
index 52bb82e5..52bb82e5 120000
--- a/437.python3.build
+++ b/436.perl.build
diff --git a/435.perl.vars b/436.perl.vars
index 853bef90..853bef90 100644
--- a/435.perl.vars
+++ b/436.perl.vars
diff --git a/438.rsync.build b/437.procps_ng.build
index 52bb82e5..52bb82e5 120000
--- a/438.rsync.build
+++ b/437.procps_ng.build
diff --git a/439.rxvt_unicode.build b/438.python3.build
index 52bb82e5..52bb82e5 120000
--- a/439.rxvt_unicode.build
+++ b/438.python3.build
diff --git a/437.python3.vars b/438.python3.vars
index 9cdc016f..9cdc016f 100644
--- a/437.python3.vars
+++ b/438.python3.vars
diff --git a/440.sed.build b/439.rsync.build
index 52bb82e5..52bb82e5 120000
--- a/440.sed.build
+++ b/439.rsync.build
diff --git a/441.tar.build b/440.rxvt_unicode.build
index 52bb82e5..52bb82e5 120000
--- a/441.tar.build
+++ b/440.rxvt_unicode.build
diff --git a/442.tcsh.build b/441.sed.build
index 52bb82e5..52bb82e5 120000
--- a/442.tcsh.build
+++ b/441.sed.build
diff --git a/443.the_silver_searcher.build b/442.tar.build
index 52bb82e5..52bb82e5 120000
--- a/443.the_silver_searcher.build
+++ b/442.tar.build
diff --git a/444.tmux.build b/443.tcsh.build
index 52bb82e5..52bb82e5 120000
--- a/444.tmux.build
+++ b/443.tcsh.build
diff --git a/445.util_linux.build b/444.the_silver_searcher.build
index 52bb82e5..52bb82e5 120000
--- a/445.util_linux.build
+++ b/444.the_silver_searcher.build
diff --git a/446.vim.build b/445.tmux.build
index 52bb82e5..52bb82e5 120000
--- a/446.vim.build
+++ b/445.tmux.build
diff --git a/447.weechat.build b/446.util_linux.build
index 52bb82e5..52bb82e5 120000
--- a/447.weechat.build
+++ b/446.util_linux.build
diff --git a/448.which.build b/447.vim.build
index 52bb82e5..52bb82e5 120000
--- a/448.which.build
+++ b/447.vim.build
diff --git a/449.whois.build b/448.weechat.build
index 52bb82e5..52bb82e5 120000
--- a/449.whois.build
+++ b/448.weechat.build
diff --git a/450.xeyes.build b/449.which.build
index 52bb82e5..52bb82e5 120000
--- a/450.xeyes.build
+++ b/449.which.build
diff --git a/451.xwd.build b/450.whois.build
index 52bb82e5..52bb82e5 120000
--- a/451.xwd.build
+++ b/450.whois.build
diff --git a/452.zsh.build b/451.xeyes.build
index 52bb82e5..52bb82e5 120000
--- a/452.zsh.build
+++ b/451.xeyes.build
diff --git a/452.xwd.build b/452.xwd.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/452.xwd.build
@@ -0,0 +1 @@
+pkg.build \ No newline at end of file
diff --git a/453.zsh.build b/453.zsh.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/453.zsh.build
@@ -0,0 +1 @@
+pkg.build \ No newline at end of file
diff --git a/README b/README
index f0f8f1ce..af6924e7 100644
--- a/README
+++ b/README
@@ -103,6 +103,7 @@ Runtime components ptycon HEAD C-IE--
3rd party libraries libevent 2.0.22-stable C-I---
3rd party libraries libfetch 2.33 C-I-P-
3rd party libraries libffi 3.2.1 C-I-P-
+3rd party libraries libfirm HEAD C-I-P-
3rd party libraries libgcrypt 1.7.3 C-I---
3rd party libraries libgpg_error 1.24 C-I-P-
3rd party libraries libksba 1.3.5 C-I-P-
@@ -138,6 +139,7 @@ Runtime components ptycon HEAD C-IE--
3rd party packages bash 4.3 C-I-P- Linked against ncursesw
3rd party packages bzip2 1.0.6 C-IE--
3rd party packages coreutils 8.23 C---P- Needs extensive testing
+3rd party packages cparser HEAD C-I-P-
3rd party packages cron HEAD C---P-
3rd party packages curl 7.47.1 C---P-
3rd party packages dash 0.5.8 C----- Provides /bin/sh
diff --git a/build.subr b/build.subr
index 98c92583..c994c7d7 100644
--- a/build.subr
+++ b/build.subr
@@ -47,7 +47,6 @@ fetch_git() {
fi;
fi;
secure_rm ${_fg_subdir};
- echo cp -pr ${DLCACHEDIR}/${_fg_subdir} .;
cp -pr ${DLCACHEDIR}/${_fg_subdir} .;
};
diff --git a/build.usage b/build.usage
index 025b91a2..f8786253 100644
--- a/build.usage
+++ b/build.usage
@@ -1,6 +1,6 @@
-usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-c] [-d] [-e] [-h] [-pi level.name.build]
+usage: ./build.sh [-x] [-a nt32|nt64] [-b debug|release] [-c] [-d] [-e] [-h] [-pi level.name.build]
[-pr level.name.build] [-r ALL|level.name.build[:diff|:step[,...]]]
- [-t[.gz|.bz2|.xz] [-x]
+ [-t[.gz|.bz2|.xz]
-a nt32|nt64 Selects 32-bit or 64-bit architecture; defaults to nt64.
-b debug|release Selects debug or release build; defaults to debug.
This currently only controls CFLAGS.
diff --git a/build.vars b/build.vars
index eb18d798..8b11cd3a 100644
--- a/build.vars
+++ b/build.vars
@@ -74,7 +74,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
# pkg.build
#
DEFAULT_MAKEFLAGS_BUILD=-j${BUILD_CPUS:=1};
-PKG_BUILD_VARS="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA DISABLED ENV_VARS_EXTRA FNAME GIT_BRANCH INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION";
+PKG_BUILD_VARS="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA DISABLED ENV_VARS_EXTRA FNAME GIT_BRANCH INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION";
PKG_LVL0_PREFIX="${PREFIX_CROSS}";
PKG_LVL0_BUILD_TYPE="host";
PKG_LVL0_CFLAGS_CONFIGURE="${PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT}";
@@ -249,9 +249,18 @@ PKG_LVL4_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
: ${PKG_LIBFETCH_MAKEFLAGS_INSTALL_EXTRA:=E=echo Q= prefix=};
: ${PKG_LIBFFI_VERSION:=3.2.1};
: ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
-: ${PKG_LIBFFI_URL=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
+: ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
: ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
: ${PKG_LIBFFI_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
+: ${PKG_LIBFIRM_URL:=http://pp.info.uni-karlsruhe.de/git/libfirm.git};
+: ${PKG_LIBFIRM_URL_TYPE:=git};
+: ${PKG_LIBFIRM_BUILD_DIR:=cparser+libfirm/build/libfirm};
+: ${PKG_LIBFIRM_CONFIGURE:=bfirm/configure};
+: ${PKG_LIBFIRM_CONFIGURE_ARGS:="--source-dir=../../../libfirm --prefix="};
+: ${PKG_LIBFIRM_GIT_BRANCH:=master};
+: ${PKG_LIBFIRM_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot};
+: ${PKG_LIBFIRM_PREFIX_EXTRA:=${PREFIX_NATIVE}};
+: ${PKG_LIBFIRM_SUBDIR:=libfirm};
: ${PKG_LIBGCRYPT_VERSION:=1.7.3};
: ${PKG_LIBGCRYPT_SHA256SUM:=ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071};
: ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
@@ -402,6 +411,15 @@ PKG_LVL4_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
: ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
: ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
: ${PKG_COREUTILS_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
+: ${PKG_CPARSER_URL:=http://pp.info.uni-karlsruhe.de/git/cparser.git};
+: ${PKG_CPARSER_URL_TYPE:=git};
+: ${PKG_CPARSER_BUILD_DIR:=cparser+libfirm/build/cparser};
+: ${PKG_CPARSER_CONFIGURE:=bcparser/configure};
+: ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../../cparser --all-static --prefix="};
+: ${PKG_CPARSER_GIT_BRANCH:=master};
+: ${PKG_CPARSER_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot};
+: ${PKG_CPARSER_PREFIX_EXTRA:=${PREFIX_NATIVE}};
+: ${PKG_CPARSER_SUBDIR:=cparser};
: ${PKG_CRON_URL:=git://anonscm.debian.org/pkg-cron/pkg-cron.git};
: ${PKG_CRON_URL_TYPE:=git};
: ${PKG_CRON_BUILD_DIR:=pkg-cron.git};
@@ -552,8 +570,8 @@ fi;
: ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz};
: ${PKG_OPENSSH_CONFIGURE_ARGS_EXTRA_DEBUG:=--disable-strip};
: ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys};
-: ${PKG_P7ZIP_URL_TYPE:=git};
: ${PKG_P7ZIP_URL:=https://github.com/lalbornoz/p7zip-midipix.git};
+: ${PKG_P7ZIP_URL_TYPE:=git};
: ${PKG_P7ZIP_BUILD_DIR:=p7zip-midipix.git};
: ${PKG_P7ZIP_NO_MAKE_INSTALL:=1};
: ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
diff --git a/pkg.build b/pkg.build
index 0123c490..888bc133 100644
--- a/pkg.build
+++ b/pkg.build
@@ -30,6 +30,9 @@ if ! is_build_script_done fetch; then
fetch_git ${PKG_SUBDIR} ${PKG_URL} ${PKG_GIT_BRANCH};
fi;
fi;
+ if test_cmd pkg_${PKG_NAME}_fetch_post; then
+ pkg_${PKG_NAME}_fetch_post;
+ fi;
set_build_script_done fetch -extract;
fi;
if test_cmd pkg_${PKG_NAME}_finish; then
@@ -119,6 +122,12 @@ if ! is_build_script_done patch; then
fi;
set_build_script_done patch -configure;
fi;
+PKG_SUBDIR_PATH=${PWD}/${PKG_SUBDIR#/};
+if [ -z "${PKG_CONFIGURE}" ]; then
+ PKG_CONFIGURE=${PKG_SUBDIR_PATH}/configure;
+else
+ PKG_CONFIGURE=${PWD}/${PKG_CONFIGURE#/};
+fi;
cd ${PKG_BUILD_DIR};
if [ "${PKG_BUILD_TYPE}" = "host" ]; then
export AR=ar;
@@ -129,14 +138,14 @@ else
export CC=${PKG_TARGET}-gcc;
export RANLIB=${PKG_TARGET}-ranlib;
fi;
-if [ -x ../${PKG_SUBDIR}/configure ]\
+if [ -x ${PKG_CONFIGURE} ]\
&& ! is_build_script_done configure; then
if test_cmd pkg_${PKG_NAME}_configure_pre; then
pkg_${PKG_NAME}_configure_pre;
fi;
CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"\
LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}"\
- ../${PKG_SUBDIR}/configure \
+ ${PKG_CONFIGURE} \
${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG};
set_build_script_done configure clean -build;
else