pyrox.dev
lol
1diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make
2--- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600
3+++ gnustep-make-2.6.6.patched/common.make 2014-12-09 21:29:10.000000000 +0600
4@@ -135,7 +135,9 @@
5 endif
6 # Then include makefiles with flags/config options installed by the
7 # libraries themselves
8--include $(GNUSTEP_MAKEFILES)/Additional/*.make
9+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
10+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)
11+endif
12
13 #
14 # Determine target specific settings
15diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in
16--- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600
17+++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600
18@@ -173,7 +173,6 @@
19 "$(makedir)/$(GNUSTEP_TARGET_CPU)" \
20 "$(makedir)/$(GNUSTEP_TARGET_DIR)" \
21 "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \
22- "$(makedir)/Additional" \
23 "$(makedir)/Auxiliary" \
24 "$(makedir)/Master" \
25 "$(makedir)/Instance" \
26@@ -314,7 +313,6 @@
27 -rmdir "$(makedir)/Instance"
28 -rmdir "$(makedir)/Master"
29 -rmdir "$(makedir)/Auxiliary"
30- -rmdir "$(makedir)/Additional"
31 -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)"
32 -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)"
33 -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)"
34diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in
35--- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600
36+++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600
37@@ -66,6 +66,7 @@
38 echo " --variable=OBJCXX"
39 echo " --variable=GNUMAKE"
40 echo " --variable=GNUSTEP_MAKEFILES"
41+ echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
42 echo " --variable=GNUSTEP_USER_DEFAULTS_DIR"
43 echo " --variable=GNUSTEP_HOST"
44 echo " --variable=GNUSTEP_HOST_CPU"
45@@ -153,6 +154,8 @@
46
47 export GNUSTEP_MAKEFILES
48
49+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
50+
51 #
52 # If all they want to know if GNUSTEP_MAKEFILES or anything that
53 # we can compute only using GNUSTEP_MAKEFILES, we can print it out
54@@ -168,6 +171,8 @@
55 exit 0;;
56 --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
57 exit 0;;
58+ --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
59+ exit 0;;
60 --variable=GNUMAKE) echo "@GNUMAKE@"
61 exit 0;;
62 --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null
63diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in
64--- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600
65+++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600
66@@ -130,6 +130,10 @@
67 setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
68 endif
69
70+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then
71+ setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@"
72+endif
73+
74 if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then
75 unsetenv GNUSTEP_USER_DIR
76 unsetenv GNUSTEP_USER_ROOT
77diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in
78--- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600
79+++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2014-12-09 20:14:19.000000000 +0600
80@@ -173,6 +173,10 @@
81 fi
82 export GNUSTEP_MAKEFILES
83
84+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then
85+ NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@
86+fi
87+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
88
89 if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
90 # Make sure this is never set in gnustep-make v2 strict mode; it
91diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in
92--- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600
93+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600
94@@ -47,7 +47,6 @@
95 # Traditionally, this is /usr/GNUstep/System/Library/Makefiles
96 GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
97
98-
99 # This is where the user home directories are. Only used to provide
100 # NSUserDirectory in gnustep-base. Never used anywhere else.
101 GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
102diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make
103--- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600
104+++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600
105@@ -142,7 +142,7 @@
106 #
107 # Third-party foundations not using make package
108 # Our own foundation will install a base.make file into
109-# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
110+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags
111 #
112 ifeq ($(FOUNDATION_LIB), nx)
113 # -framework Foundation is used both to find headers, and to link
114@@ -166,7 +166,7 @@
115
116 #
117 # FIXME - Ask Helge to move this inside his libFoundation, and have
118-# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
119+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make
120 #
121 ifeq ($(FOUNDATION_LIB),fd)
122 -include $(GNUSTEP_MAKEFILES)/libFoundation.make
123@@ -193,7 +193,7 @@
124 GUI_LIBS =
125 #
126 # Third-party GUI libraries - our own sets its flags into
127-# $(GNUSTEP_MAKEFILES)/Additional/gui.make
128+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make
129 #
130 ifeq ($(GUI_LIB), nx)
131 GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
132diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make
133--- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600
134+++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600
135@@ -667,7 +667,9 @@
136 exit 1$(END_ECHO)
137 endif
138
139-$(GNUSTEP_MAKEFILES)/Additional/*.make: ;
140+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
141+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ;
142+endif
143
144 $(GNUSTEP_MAKEFILES)/Master/*.make: ;
145