Ticket #124: kbuild-008-gcc4.patch

Config.kmk

@@ -216 +216 @@
 TEMPLATE_BIN_CFLAGS             = -g
 TEMPLATE_BIN_CFLAGS.profile     = -pg
 TEMPLATE_BIN_CFLAGS.release     = -O3
-TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024 -g
+TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack 1024 -g
 endif
 
 ifeq ($(KBUILD_TARGET),darwin)

src/kmk/kmkbuiltin/mv.c

@@ -108 +108 @@
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
 # ifdef __OS2__
-static
+/* pwd.h in libc declares user_from_uid (never implemented), hide it */
+#define user_from_uid kmk_user_from_uid
+#define group_from_uid kmk_group_from_uid
 # endif
 const char *user_from_uid(uid_t id, int x)
 {
@@ -117 +119 @@
         (void)x;
         return s_buf;
 }
-# ifdef __OS2__
-static
-# endif
 const char *group_from_gid(gid_t id, int x)
 {
         static char s_buf[64];

tests/Config.kmk

@@ -36 +36 @@
  TEMPLATE_TST_TOOL              = GCC3OMF
  TEMPLATE_TST_CFLAGS.profile    = -pg
  TEMPLATE_TST_CFLAGS.release    = -O3
- TEMPLATE_TST_LDFLAGS           = -Zhigh-mem -Zstack=1024
+ TEMPLATE_TST_LDFLAGS           = -Zhigh-mem -Zstack 1024
 endif
 
 ifeq ($(BUILD_TARGET),darwin)