Hello
I'm following up with a couple patches that haven't been merged to Gambit [yet].
Apply with git am.
Christian.
Afficher les réponses par date
A forgotten change. --- lib/os_base.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/lib/os_base.c b/lib/os_base.c index 5a7be69..6d88918 100644 --- a/lib/os_base.c +++ b/lib/os_base.c @@ -26,11 +26,6 @@ ___base_module ___base_mod = 0, 0, 0 -#ifdef ___DEBUG_ALLOC_MEM_TRACE - , - 0, - 0 -#endif #endif
#ifdef ___BASE_MODULE_INIT
--- lib/os_base.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/os_base.c b/lib/os_base.c index 6d88918..e1312e8 100644 --- a/lib/os_base.c +++ b/lib/os_base.c @@ -19,13 +19,13 @@
___base_module ___base_mod = { - 0 + 0 /* refcount */
#ifdef ___DEBUG , - 0, - 0, - 0 + 0, /* debug */ + 0, /* alloc_mem_calls */ + 0 /* free_mem_calls */ #endif
#ifdef ___BASE_MODULE_INIT
--- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore index 95701ca..a7ae343 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ gambc-v*.tgz *.pdb *.dep *.idb +console
The two environment variables are mentioned by various blog posts on the web. Apple changed the name from one to the other in some OS X release, thus set both here. --- makefile.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/makefile.in b/makefile.in index 80980e0..b54c41a 100644 --- a/makefile.in +++ b/makefile.in @@ -40,6 +40,9 @@ RC = @RC@ GIT = @GIT@ HG = @HG@
+# disable addition of HFS/HFS+ metadata on OS X: +TAR = COPY_EXTENDED_ATTRIBUTES_DISABLE=true COPYFILE_DISABLE=true tar + prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = @includedir@ @@ -331,7 +334,7 @@ dist-pre: done
dist-post: - tar chof $(PACKAGE_TARNAME).tar $(PACKAGE_TARNAME) + $(TAR) chof $(PACKAGE_TARNAME).tar $(PACKAGE_TARNAME) gzip -9 $(PACKAGE_TARNAME).tar mv $(PACKAGE_TARNAME).tar.gz $(PACKAGE_TARNAME).tgz rm -rf $(PACKAGE_TARNAME) @@ -369,7 +372,7 @@ dist-devel-pre: dist-devel-post: rm -rf $(PACKAGE_TARNAME)-devel mv $(PACKAGE_TARNAME) $(PACKAGE_TARNAME)-devel - tar chof $(PACKAGE_TARNAME)-devel.tar $(PACKAGE_TARNAME)-devel + $(TAR) chof $(PACKAGE_TARNAME)-devel.tar $(PACKAGE_TARNAME)-devel gzip -9 $(PACKAGE_TARNAME)-devel.tar mv $(PACKAGE_TARNAME)-devel.tar.gz $(PACKAGE_TARNAME)-devel.tgz rm -rf $(PACKAGE_TARNAME)-devel
NOTE: there are a couple more places in makefile.in that don't stop on errors when they probably should. This patch only fixes those directly related to the usage of Git. --- makefile.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/makefile.in b/makefile.in index b54c41a..9ed3c5c 100644 --- a/makefile.in +++ b/makefile.in @@ -143,7 +143,7 @@ push: fake_target
pull: fake_target @if test "$(RC)" = "$(GIT)"; then \ - $(GIT) pull; \ + $(GIT) pull && \ $(GIT) fetch --tags; \ else \ $(HG) pull; \ @@ -162,9 +162,9 @@ update-nopull: fake_target $(HG) checkout; \ fi; \ else \ - $(RC) checkout $$next_version-bootstrap; \ - $(MAKE) bootstrap; \ - $(RC) checkout $$next_version; \ + $(RC) checkout $$next_version-bootstrap && \ + $(MAKE) bootstrap && \ + $(RC) checkout $$next_version && \ $(MAKE) bootclean bootstrap update; \ fi
-
Christian Jaeger