diff --git a/331.git.build b/331.git.build new file mode 120000 index 0000000..52bb82e --- /dev/null +++ b/331.git.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/build.vars b/build.vars index 7ab22d1..71d5f1b 100644 --- a/build.vars +++ b/build.vars @@ -23,7 +23,7 @@ : ${PREFIX:=${HOME}/midipix}; : ${PREFIX_NATIVE:=${PREFIX}/native}; : ${TARGET:=x86_64-nt64-midipix}; -: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS PREFIX RANLIB"}; +: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"}; : ${PREFIX_TARGET:=${PREFIX}/${TARGET}}; : ${PREFIX_LVL0:=${PREFIX_TARGET}}; : ${PREFIX_LVL1:=${PREFIX_NATIVE}}; @@ -96,6 +96,10 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_GCC_VERSION:=4.6.4}; : ${PKG_GIT_SUBDIR:=git}; : ${PKG_GIT_BUILD_DIR=${PKG_GIT_SUBDIR}}; +: ${PKG_GIT_CC=${HOST_NATIVE}-gcc}; +: ${PKG_GIT_CFLAGS=-I. -I${PREFIX_LVL3}/include}; +: ${PKG_GIT_LDFLAGS=-L${PREFIX_LVL3}/lib}; +: ${PKG_GIT_MAKEFLAGS=NO_CURL=1 V=99}; : ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1}; : ${PKG_GIT_NO_CONFIGURE:=1}; : ${PKG_GIT_URL:=https://github.com/git/git.git}; diff --git a/pkg.build b/pkg.build index 99bdb2c..ac7bd85 100644 --- a/pkg.build +++ b/pkg.build @@ -5,7 +5,7 @@ # Order for build level 2 (runtime:) psxtypes pemagine dalist ntapi psxscl ntcon ntctty parse_with_pkg_name ${2} \ bash binutils binutils_host bzip2 coreutils \ - dalist dash diffutils findutils gawk gmp \ + dalist dash diffutils findutils gawk git gmp \ grep gzip less libelf libressl libz make mpc mpfr \ ncurses ntapi ntcon ntctty patch pemagine popt psxscl \ psxstub psxtypes rsync sed tar util_linux which xz;