diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 9 | ||||
| -rw-r--r-- | patches/git-2.35.2.local.patch | 81 |
2 files changed, 86 insertions, 4 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 229d6fa3..32a9f8cd 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -54,16 +54,17 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")"; : ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; : ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"}; : ${PKG_GIT_DEPENDS:="curl libz"}; -: ${PKG_GIT_SHA256SUM:=8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61}; -: ${PKG_GIT_VERSION:=2.30.0}; +: ${PKG_GIT_SHA256SUM:=6f2287bbde2d215394966732836f3aba62b029161e8eaadaf236578d92c06fe9}; +: ${PKG_GIT_VERSION:=2.35.2}; : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz}; +: ${PKG_GIT_CFLAGS_BUILD_EXTRA:="-std=gnu99"}; : ${PKG_GIT_CONFIG_CACHE_EXTRA:=" ac_cv_fread_reads_directories=1 ac_cv_snprintf_returns_bogus=0"}; : ${PKG_GIT_CONFIG_CACHE_LOCAL:="ac_cv_iconv_omits_bom=false"}; : ${PKG_GIT_IN_TREE:=1}; -: ${PKG_GIT_MAKEFLAGS_BUILD:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"}; -: ${PKG_GIT_MAKEFLAGS_INSTALL:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"}; +: ${PKG_GIT_MAKEFLAGS_BUILD:="CFLAGS=-std=gnu99 CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"}; +: ${PKG_GIT_MAKEFLAGS_INSTALL:="CFLAGS=-std=gnu99 CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"}; : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}}; : ${PKG_GNUPG_DEPENDS:="libassuan libgcrypt libgpg_error libksba npth sqlite3"}; : ${PKG_GNUPG_SHA256SUM:=f3468ecafb1d7f9ad7b51fd1db7aebf17ceb89d2efa8a05cf2f39b4d405402ae}; diff --git a/patches/git-2.35.2.local.patch b/patches/git-2.35.2.local.patch new file mode 100644 index 00000000..0b885529 --- /dev/null +++ b/patches/git-2.35.2.local.patch @@ -0,0 +1,81 @@ +--- git-2.35.2/Makefile.orig 2022-03-24 00:31:43.000000000 +0100 ++++ git-2.35.2/Makefile 2022-04-14 12:43:38.240213010 +0200 +@@ -2213,7 +2213,7 @@ + '-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \ + '-DGIT_INFO_PATH="$(infodir_relative_SQ)"' + +-git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) ++git$X: git.o $(BUILTIN_OBJS) $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \ + $(filter %.o,$^) $(LIBS) + +@@ -2390,7 +2390,7 @@ + $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS + + ifndef NO_PYTHON +-$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS ++$(SCRIPT_PYTHON_GEN): GIT-PREFIX GIT-PYTHON-VARS + $(SCRIPT_PYTHON_GEN): % : %.py + $(QUIET_GEN) \ + sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ +@@ -2538,12 +2538,12 @@ + + .SUFFIXES: + +-$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) ++$(C_OBJ): %.o: %.c $(missing_dep_dirs) $(missing_compdb_dir) + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< +-$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) ++$(ASM_OBJ): %.o: %.S $(missing_dep_dirs) $(missing_compdb_dir) + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< + +-%.s: %.c GIT-CFLAGS FORCE ++%.s: %.c FORCE + $(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< + + ifdef USE_COMPUTED_HEADER_DEPENDENCIES +@@ -2607,17 +2607,17 @@ + compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null + endif + +-git-%$X: %.o GIT-LDFLAGS $(GITLIBS) ++git-%$X: %.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) + +-git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS) ++git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(IMAP_SEND_LDFLAGS) $(LIBS) + +-git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS) ++git-http-fetch$X: http.o http-walker.o http-fetch.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(CURL_LIBCURL) $(LIBS) +-git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS) ++git-http-push$X: http.o http-push.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS) + +@@ -2627,11 +2627,11 @@ + ln -s $< $@ 2>/dev/null || \ + cp $< $@ + +-$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS) ++$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS) + +-contrib/scalar/scalar$X: $(SCALAR_OBJECTS) GIT-LDFLAGS $(GITLIBS) ++contrib/scalar/scalar$X: $(SCALAR_OBJECTS) $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \ + $(filter %.o,$^) $(LIBS) + +@@ -2945,7 +2945,7 @@ + + t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) + +-t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB) ++t/helper/test-%$X: t/helper/test-%.o $(GITLIBS) $(REFTABLE_TEST_LIB) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS) + + check-sha1:: t/helper/test-tool$X |