summaryrefslogtreecommitdiff
path: root/libc/debian/patches/libc-add-get_current_dir_name.patch
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-03-02 23:28:12 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-03-02 23:28:12 +0400
commitf7b1409c7351d68c15dc7ef208323fcbac34966d (patch)
tree2932987627b89afc408424b95d01d1c15a7fce54 /libc/debian/patches/libc-add-get_current_dir_name.patch
parent39b7e5055c452b7b84967bd0938e3c8f96c5cfb1 (diff)
downloadillumos-packaging-f7b1409c7351d68c15dc7ef208323fcbac34966d.tar.gz
libc 4.3: updated patches
Diffstat (limited to 'libc/debian/patches/libc-add-get_current_dir_name.patch')
-rw-r--r--libc/debian/patches/libc-add-get_current_dir_name.patch36
1 files changed, 18 insertions, 18 deletions
diff --git a/libc/debian/patches/libc-add-get_current_dir_name.patch b/libc/debian/patches/libc-add-get_current_dir_name.patch
index c0a2ba8..fad82db 100644
--- a/libc/debian/patches/libc-add-get_current_dir_name.patch
+++ b/libc/debian/patches/libc-add-get_current_dir_name.patch
@@ -1,11 +1,11 @@
Description: add get_current_dir_name() - the GNU extension
We cannot add it to getcwd.c, because libc_pic.a goes to ld.so.1
and it gets some functions multiple defined (e. g. malloc, read)
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
===================================================================
---- libc.orig/usr/src/head/unistd.h 2013-07-27 01:36:14.023987907 +0400
-+++ libc/usr/src/head/unistd.h 2013-07-27 01:37:06.411676489 +0400
-@@ -331,6 +331,9 @@
+--- a/usr/src/head/unistd.h 2014-03-02 23:23:33.560744425 +0400
++++ b/usr/src/head/unistd.h 2014-03-02 23:24:19.242793108 +0400
+@@ -336,6 +336,9 @@
extern int ftruncate(int, off_t);
#endif /* !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE > 2)... */
extern char *getcwd(char *, size_t);
@@ -15,11 +15,11 @@ Index: libc/usr/src/head/unistd.h
#if !defined(__XOPEN_OR_POSIX) || (defined(_XPG4_2) && !defined(_XPG6)) || \
defined(__EXTENSIONS__)
extern int getdtablesize(void);
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers 2013-07-27 01:36:14.024145729 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers 2013-07-27 01:37:06.419144519 +0400
-@@ -103,6 +103,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers 2014-03-02 23:24:11.652848232 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers 2014-03-02 23:24:19.248906611 +0400
+@@ -138,6 +138,7 @@
fts_open;
fts_read;
fts_set;
@@ -27,10 +27,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
getgrouplist;
gnu_strerror_r;
mempcpy;
-Index: libc/usr/src/lib/libc/port/gen/get_current_dir_name.c
+Index: b/usr/src/lib/libc/port/gen/get_current_dir_name.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/get_current_dir_name.c 2013-07-27 01:45:16.551536211 +0400
++++ b/usr/src/lib/libc/port/gen/get_current_dir_name.c 2014-03-02 23:24:19.251471523 +0400
@@ -0,0 +1,39 @@
+
+/*
@@ -71,11 +71,11 @@ Index: libc/usr/src/lib/libc/port/gen/get_current_dir_name.c
+
+ return NULL;
+}
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com 2013-07-27 00:57:36.971349244 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com 2013-07-27 01:47:28.033970356 +0400
-@@ -413,6 +413,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com 2014-03-02 23:24:11.646472983 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com 2014-03-02 23:24:19.254038108 +0400
+@@ -415,6 +415,7 @@
fts.o \
ftw.o \
gcvt.o \
@@ -83,11 +83,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
getauxv.o \
getcwd.o \
getdate_err.o \
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile 2013-07-27 00:57:36.973818331 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile 2013-07-27 01:47:50.818022085 +0400
-@@ -383,6 +383,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile 2014-03-02 23:24:11.648948976 +0400
++++ b/usr/src/lib/libc/amd64/Makefile 2014-03-02 23:24:19.256268158 +0400
+@@ -385,6 +385,7 @@
fts.o \
ftw.o \
gcvt.o \