| 1 |
haubi 11/03/30 11:34:45 |
| 2 |
|
| 3 |
Modified: baselayout-1.12.5-solaris.patch |
| 4 |
Added: baselayout-1.12.5-strsep.patch |
| 5 |
baselayout-1.12.5-libsvar.patch |
| 6 |
Log: |
| 7 |
baselayout-prefix-1.12.5: Split strsep out of solaris patch and use it in r9 only. |
| 8 |
In r10, use private gnulib instance, as it might be missing during bootstrap. |
| 9 |
Also need to include config.h to redefine 'restrict'. |
| 10 |
|
| 11 |
(Portage version: 2.2.01.18125-prefix/cvs/AIX 00C0078A4C00) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.2 sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch?rev=1.2&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch?rev=1.2&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch?r1=1.1&r2=1.2 |
| 19 |
|
| 20 |
Index: baselayout-1.12.5-solaris.patch |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch,v |
| 23 |
retrieving revision 1.1 |
| 24 |
retrieving revision 1.2 |
| 25 |
diff -u -r1.1 -r1.2 |
| 26 |
--- baselayout-1.12.5-solaris.patch 28 Mar 2011 15:38:17 -0000 1.1 |
| 27 |
+++ baselayout-1.12.5-solaris.patch 30 Mar 2011 11:34:45 -0000 1.2 |
| 28 |
@@ -64,45 +64,3 @@ |
| 29 |
|
| 30 |
|
| 31 |
static void |
| 32 |
---- src/core/misc.h |
| 33 |
-+++ src/core/misc.h |
| 34 |
-@@ -284,5 +284,9 @@ |
| 35 |
- void file_unmap(char *buf, size_t bufsize); |
| 36 |
- size_t buf_get_line(char *buf, size_t buflen, size_t cur); |
| 37 |
- |
| 38 |
-+#if defined (__SVR4) && defined (__sun) |
| 39 |
-+char* strsep(char** str, const char* delims); |
| 40 |
-+#endif |
| 41 |
-+ |
| 42 |
- #endif /* _MISC_H */ |
| 43 |
- |
| 44 |
---- src/core/misc.c |
| 45 |
-+++ src/core/misc.c |
| 46 |
-@@ -647,3 +647,27 @@ |
| 47 |
- return count - cur; |
| 48 |
- } |
| 49 |
- |
| 50 |
-+#if defined (__SVR4) && defined (__sun) |
| 51 |
-+char* strsep(char** str, const char* delims) |
| 52 |
-+{ |
| 53 |
-+ char* token; |
| 54 |
-+ |
| 55 |
-+ if (*str == NULL) { |
| 56 |
-+ /* No more tokens */ |
| 57 |
-+ return NULL; |
| 58 |
-+ } |
| 59 |
-+ |
| 60 |
-+ token=*str; |
| 61 |
-+ while (**str != '\0') { |
| 62 |
-+ if (strchr(delims, **str) != NULL) { |
| 63 |
-+ **str = '\0'; |
| 64 |
-+ (*str)++; |
| 65 |
-+ return token; |
| 66 |
-+ } |
| 67 |
-+ (*str)++; |
| 68 |
-+ } |
| 69 |
-+ /* There is no other token */ |
| 70 |
-+ *str = NULL; |
| 71 |
-+ return token; |
| 72 |
-+} |
| 73 |
-+#endif |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch?rev=1.1&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch?rev=1.1&content-type=text/plain |
| 81 |
|
| 82 |
Index: baselayout-1.12.5-strsep.patch |
| 83 |
=================================================================== |
| 84 |
--- src/core/misc.h |
| 85 |
+++ src/core/misc.h |
| 86 |
@@ -284,5 +284,9 @@ |
| 87 |
void file_unmap(char *buf, size_t bufsize); |
| 88 |
size_t buf_get_line(char *buf, size_t buflen, size_t cur); |
| 89 |
|
| 90 |
+#if defined (__SVR4) && defined (__sun) |
| 91 |
+char* strsep(char** str, const char* delims); |
| 92 |
+#endif |
| 93 |
+ |
| 94 |
#endif /* _MISC_H */ |
| 95 |
|
| 96 |
--- src/core/misc.c |
| 97 |
+++ src/core/misc.c |
| 98 |
@@ -647,3 +647,27 @@ |
| 99 |
return count - cur; |
| 100 |
} |
| 101 |
|
| 102 |
+#if defined (__SVR4) && defined (__sun) |
| 103 |
+char* strsep(char** str, const char* delims) |
| 104 |
+{ |
| 105 |
+ char* token; |
| 106 |
+ |
| 107 |
+ if (*str == NULL) { |
| 108 |
+ /* No more tokens */ |
| 109 |
+ return NULL; |
| 110 |
+ } |
| 111 |
+ |
| 112 |
+ token=*str; |
| 113 |
+ while (**str != '\0') { |
| 114 |
+ if (strchr(delims, **str) != NULL) { |
| 115 |
+ **str = '\0'; |
| 116 |
+ (*str)++; |
| 117 |
+ return token; |
| 118 |
+ } |
| 119 |
+ (*str)++; |
| 120 |
+ } |
| 121 |
+ /* There is no other token */ |
| 122 |
+ *str = NULL; |
| 123 |
+ return token; |
| 124 |
+} |
| 125 |
+#endif |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
1.1 sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch |
| 130 |
|
| 131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch?rev=1.1&view=markup |
| 132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch?rev=1.1&content-type=text/plain |
| 133 |
|
| 134 |
Index: baselayout-1.12.5-libsvar.patch |
| 135 |
=================================================================== |
| 136 |
Need to add libraries after object files, or solaris |
| 137 |
linker might not see library's symbols to be needed |
| 138 |
when added to LDFLAGS. |
| 139 |
|
| 140 |
--- src/Makefile.orig 2011-03-30 13:15:56 +0200 |
| 141 |
+++ src/Makefile 2011-03-30 13:16:52 +0200 |
| 142 |
@@ -30,10 +30,10 @@ |
| 143 |
$(CC) $(CFLAGS) -c -o $@ $^ |
| 144 |
|
| 145 |
runscript: runscript.o rs-misc.o |
| 146 |
- $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_RS) |
| 147 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_RS) |
| 148 |
|
| 149 |
start-stop-daemon: start-stop-daemon.c |
| 150 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_SSD) |
| 151 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_SSD) |
| 152 |
|
| 153 |
install: $(TARGET) |
| 154 |
install -m 0755 -d $(DESTDIR)/bin |
Archives