From 048afe23bbadd380c401bfb975dc8221e4f536f7 Mon Sep 17 00:00:00 2001 From: NicJA Date: Sat, 29 Apr 2017 00:28:22 +0000 Subject: [PATCH] wip update. # provide dummy definitions for the poll code. # override configures detection of the need to link with libgen and libsocket. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54616 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- development/scm/git/mmakefile.src | 12 ++++++++++-- development/scm/git/v2.12.2-aros.diff | 24 ++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/development/scm/git/mmakefile.src b/development/scm/git/mmakefile.src index b71ff2d9f..0787aa343 100644 --- a/development/scm/git/mmakefile.src +++ b/development/scm/git/mmakefile.src @@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg #MM contrib-development-git : contrib-development-git-setup -#MM contrib-development-git-setup : contrib-development-git-fetch +#MM contrib-development-git-setup : contrib-development-git-fetch contrib-development-git-gendirs DESTDIR := $(AROS_DEVELOPER) @@ -25,6 +25,8 @@ GIT_PORTDIR := $(PORTSDIR)/git GIT_ARCHBASE := v$(GIT_VERSION) GIT_ARCHDIR := git-$(GIT_VERSION) +GIT_OVERRIDES := "NEEDS_LIBGEN=\\nNEEDS_SOCKET=\\n" + BUILD_ENV := $(GIT_ENV) # uncomment to get verbose build output.. @@ -37,7 +39,7 @@ USER_LDFLAGS := -L$(AROS_CONTRIB_LIB) contrib-development-git-setup : @$(IF) $(TEST) -d $(GIT_PORTDIR)/$(GIT_ARCHDIR) \ && ! $(TEST) -f $(GIT_PORTDIR)/$(GIT_ARCHDIR)/configure ; then \ - cd $(GIT_PORTDIR)/$(GIT_ARCHDIR) && $(MAKE) configure ; \ + cd $(GIT_PORTDIR)/$(GIT_ARCHDIR) && $(MAKE) configure && $(ECHO) -e "$(GIT_OVERRIDES)" > $(GENDIR)/$(CURDIR)/config.mak; \ fi %fetch mmake=contrib-development-git-fetch archive=$(GIT_ARCHBASE) suffixes="tar.gz" \ @@ -56,3 +58,9 @@ USER_CFLAGS := $(NOAWRN_FLAGS) -DBSDSOCKET_NOLIBDEFINES %build_with_configure mmake=contrib-development-git compiler=target \ srcdir=$(GIT_PORTDIR)/$(GIT_ARCHDIR) prefix="$(DESTDIR)" gnuflags=no nix=yes \ config_env_extra="$(GIT_CONFIG_ENV)" extraoptions="$(GIT_OPTIONS)" + +#MM +contrib-development-git-gendirs: + $(MKDIR) $(GENDIR)/$(CURDIR) + +%common diff --git a/development/scm/git/v2.12.2-aros.diff b/development/scm/git/v2.12.2-aros.diff index e18e98694..20de415d4 100644 --- a/development/scm/git/v2.12.2-aros.diff +++ b/development/scm/git/v2.12.2-aros.diff @@ -1,6 +1,6 @@ diff -ruN -X ./exclude.patterns git-2.12.2/config.mak.uname git-2.12.2.aros/config.mak.uname --- git-2.12.2/config.mak.uname 2017-03-24 19:59:15.000000000 +0000 -+++ git-2.12.2.aros/config.mak.uname 2017-04-19 21:28:22.429203045 +0100 ++++ git-2.12.2.aros/config.mak.uname 2017-04-29 01:07:42.342560424 +0100 @@ -1,11 +1,13 @@ # Platform specific Makefile tweaks based on uname detection @@ -26,7 +26,7 @@ diff -ruN -X ./exclude.patterns git-2.12.2/config.mak.uname git-2.12.2.aros/conf # we had "elif" things would have been much nicer... +ifeq ($(uname_S),AROS) -+ BASIC_CFLAGS += -D__BSD_VISIBLE ++ BASIC_CFLAGS += -D__BSD_VISIBLE + NO_CURL = YesPlease + BLK_SHA1 = YesPlease + NO_LIBGEN_H = YesPlease @@ -45,7 +45,7 @@ diff -ruN -X ./exclude.patterns git-2.12.2/config.mak.uname git-2.12.2.aros/conf BASIC_CFLAGS += -D_OSF_SOURCE diff -ruN -X ./exclude.patterns git-2.12.2/configure.ac git-2.12.2.aros/configure.ac --- git-2.12.2/configure.ac 2017-03-24 19:59:15.000000000 +0000 -+++ git-2.12.2.aros/configure.ac 2017-04-19 21:28:22.429203045 +0100 ++++ git-2.12.2.aros/configure.ac 2017-04-29 00:52:09.836368719 +0100 @@ -707,17 +707,17 @@ test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" @@ -72,7 +72,7 @@ diff -ruN -X ./exclude.patterns git-2.12.2/configure.ac git-2.12.2.aros/configur test -n "$LIBC_CONTAINS_LIBINTL" || LIBS="$LIBS -lintl" diff -ruN -X ./exclude.patterns git-2.12.2/git-compat-util.h git-2.12.2.aros/git-compat-util.h --- git-2.12.2/git-compat-util.h 2017-03-24 19:59:15.000000000 +0000 -+++ git-2.12.2.aros/git-compat-util.h 2017-04-19 21:28:22.429203045 +0100 ++++ git-2.12.2.aros/git-compat-util.h 2017-04-29 00:52:09.836368719 +0100 @@ -180,11 +180,13 @@ #include #include @@ -87,7 +87,7 @@ diff -ruN -X ./exclude.patterns git-2.12.2/git-compat-util.h git-2.12.2.aros/git #ifdef HAVE_BSD_SYSCTL #include #endif -@@ -231,6 +233,14 @@ +@@ -231,6 +233,22 @@ #define _ALL_SOURCE 1 #endif @@ -97,6 +97,14 @@ diff -ruN -X ./exclude.patterns git-2.12.2/git-compat-util.h git-2.12.2.aros/git +#endif +#define fork vfork +#define getpagesize() PAGE_SIZE ++ ++#define POLLIN 0x1 ++#define POLLOUT 0x4 ++struct pollfd { ++ int fd; ++ int events; ++}; ++#define poll(pfd, a, b) +#endif + /* used on Mac OS X */ @@ -104,8 +112,8 @@ diff -ruN -X ./exclude.patterns git-2.12.2/git-compat-util.h git-2.12.2.aros/git #include "compat/precompose_utf8.h" diff -ruN -X ./exclude.patterns git-2.12.2/run-command.c git-2.12.2.aros/run-command.c --- git-2.12.2/run-command.c 2017-03-24 19:59:15.000000000 +0000 -+++ git-2.12.2.aros/run-command.c 2017-04-19 21:28:22.429203045 +0100 -@@ -913,6 +917,7 @@ ++++ git-2.12.2.aros/run-command.c 2017-04-29 00:52:09.836368719 +0100 +@@ -913,6 +913,7 @@ return ret; } @@ -113,7 +121,7 @@ diff -ruN -X ./exclude.patterns git-2.12.2/run-command.c git-2.12.2.aros/run-com struct io_pump { /* initialized by caller */ int fd; -@@ -1385,3 +1390,4 @@ +@@ -1385,3 +1386,4 @@ pp_cleanup(&pp); return 0; } -- 2.11.4.GIT