new platform & S_IFGITLINK problem

[Alan Hourihane <alanh@fairlite.co.uk>]

[-- Attachment #1: Type: text/plain, Size: 1106 bytes --]

Hello,

Just joined as I'm compiling git on a new platform and wondered if
someone can help solve a problem with the definition of S_IFGITLINK.

On my platform I have the following definitions....

#define __S_IFSOCK      0010000 /* Socket.  */
#define __S_IFCHR       0020000 /* Character device.  */
#define __S_IFDIR       0040000 /* Directory.  */
#define __S_IFBLK       0060000 /* Block device.  */
#define __S_IFREG       0100000 /* Regular file.  */
#define __S_IFIFO       0120000 /* FIFO.  */
#define __S_IFMEM       0140000 /* memory region or process */
#define __S_IFLNK       0160000 /* Symbolic link.  */

Yet, S_IFGITLINK in the git sources is defined as 0160000, so this
clashes with my platform.

There is a comment about the definition of S_IFGITLINK in cache.h that
it shouldn't be used like this and should use internal values.

So I'm wondering if this can be fixed to remove this assumption ?

Additionally, attached is a patch that I currently need to apply in
order to compile git successfully on the FreeMiNT platform (which is
m68k based).

Comments appreciated.

Thanks,

Alan.

[-- Attachment #2: git-1.7.0.4-mint.patch --]
[-- Type: text/x-patch, Size: 1857 bytes --]

--- git-compat-util.h	2008-12-22 18:35:58.000000000 +0000
+++ git-compat-util.h	2008-12-22 18:39:21.000000000 +0000
@@ -123,7 +123,9 @@
 #ifdef _MSC_VER
 #include "compat/msvc.h"
 #endif
-
+#ifdef __MINT__
+#include "compat/mint.h"
+#endif
 #ifndef NO_LIBGEN_H
 #include <libgen.h>
 #else
--- /dev/null	2008-12-07 20:01:52.000000000 +0000
+++ compat/mint.h	2008-12-23 11:52:10.000000000 +0000
@@ -0,0 +1,2 @@
+#define SA_RESTART 0
+#define ss_family sa_family
--- Makefile	2009-01-29 12:12:01.000000000 +0000
+++ Makefile	2009-01-29 12:13:39.000000000 +0000
@@ -1618,7 +1613,7 @@
 
 git-imap-send$X: imap-send.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
+		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
 
 http.o http-walker.o http-push.o: http.h
 
@@ -1626,10 +1621,10 @@
 
 git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-		$(LIBS) $(CURL_LIBCURL)
+		$(LIBS) $(CURL_LIBCURL) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
 git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
+		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
 
 $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
 	$(QUIET_LNCP)$(RM) $@ && \
@@ -1639,7 +1634,7 @@
 
 $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
+		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
 
 $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
 $(patsubst git-%$X,%.o,$(PROGRAMS)) git.o: $(LIB_H) $(wildcard */*.h)