Added debian/patches/dyson-libc.patch

3 files changed, 161 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 7cd3a74e3..17940ab18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 golang (2:1.4.2-3+dyson1) UNRELEASED; urgency=medium
 
   * Package for Dyson
-  * Added debian/patches/dyson-EOF.patch
-  * Added support for illumos-amd64 (d/rules, d/control*)
+      - Added support for illumos-amd64 (d/rules, d/control*)
+      - Added debian/patches/dyson-EOF.patch
+      - Added debian/patches/dyson-libc.patch
 
  -- Igor Pashev <pashev.igor@gmail.com>  Fri, 17 Jul 2015 22:22:51 +0300
 
diff --git a/debian/patches/dyson-libc.patch b/debian/patches/dyson-libc.patch
new file mode 100644
index 000000000..433730722
--- /dev/null
+++ b/debian/patches/dyson-libc.patch
@@ -0,0 +1,157 @@
+Index: golang/src/runtime/os_solaris.c
+===================================================================
+--- golang.orig/src/runtime/os_solaris.c
++++ golang/src/runtime/os_solaris.c
+@@ -13,38 +13,38 @@
+ #pragma dynexport runtime·etext _etext
+ #pragma dynexport runtime·edata _edata
+ 
+-#pragma dynimport libc·___errno ___errno "libc.so"
+-#pragma dynimport libc·clock_gettime clock_gettime "libc.so"
+-#pragma dynimport libc·close close "libc.so"
+-#pragma dynimport libc·exit exit "libc.so"
+-#pragma dynimport libc·fstat fstat "libc.so"
+-#pragma dynimport libc·getcontext getcontext "libc.so"
+-#pragma dynimport libc·getrlimit getrlimit "libc.so"
+-#pragma dynimport libc·malloc malloc "libc.so"
+-#pragma dynimport libc·mmap mmap "libc.so"
+-#pragma dynimport libc·munmap munmap "libc.so"
+-#pragma dynimport libc·open open "libc.so"
+-#pragma dynimport libc·pthread_attr_destroy pthread_attr_destroy "libc.so"
+-#pragma dynimport libc·pthread_attr_getstack pthread_attr_getstack "libc.so"
+-#pragma dynimport libc·pthread_attr_init pthread_attr_init "libc.so"
+-#pragma dynimport libc·pthread_attr_setdetachstate pthread_attr_setdetachstate "libc.so"
+-#pragma dynimport libc·pthread_attr_setstack pthread_attr_setstack "libc.so"
+-#pragma dynimport libc·pthread_create pthread_create "libc.so"
+-#pragma dynimport libc·raise raise "libc.so"
+-#pragma dynimport libc·read read "libc.so"
+-#pragma dynimport libc·select select "libc.so"
+-#pragma dynimport libc·sched_yield sched_yield "libc.so"
+-#pragma dynimport libc·sem_init sem_init "libc.so"
+-#pragma dynimport libc·sem_post sem_post "libc.so"
+-#pragma dynimport libc·sem_reltimedwait_np sem_reltimedwait_np "libc.so"
+-#pragma dynimport libc·sem_wait sem_wait "libc.so"
+-#pragma dynimport libc·setitimer setitimer "libc.so"
+-#pragma dynimport libc·sigaction sigaction "libc.so"
+-#pragma dynimport libc·sigaltstack sigaltstack "libc.so"
+-#pragma dynimport libc·sigprocmask sigprocmask "libc.so"
+-#pragma dynimport libc·sysconf sysconf "libc.so"
+-#pragma dynimport libc·usleep usleep "libc.so"
+-#pragma dynimport libc·write write "libc.so"
++#pragma dynimport libc·___errno ___errno "libc.so.1"
++#pragma dynimport libc·clock_gettime clock_gettime "libc.so.1"
++#pragma dynimport libc·close close "libc.so.1"
++#pragma dynimport libc·exit exit "libc.so.1"
++#pragma dynimport libc·fstat fstat "libc.so.1"
++#pragma dynimport libc·getcontext getcontext "libc.so.1"
++#pragma dynimport libc·getrlimit getrlimit "libc.so.1"
++#pragma dynimport libc·malloc malloc "libc.so.1"
++#pragma dynimport libc·mmap mmap "libc.so.1"
++#pragma dynimport libc·munmap munmap "libc.so.1"
++#pragma dynimport libc·open open "libc.so.1"
++#pragma dynimport libc·pthread_attr_destroy pthread_attr_destroy "libc.so.1"
++#pragma dynimport libc·pthread_attr_getstack pthread_attr_getstack "libc.so.1"
++#pragma dynimport libc·pthread_attr_init pthread_attr_init "libc.so.1"
++#pragma dynimport libc·pthread_attr_setdetachstate pthread_attr_setdetachstate "libc.so.1"
++#pragma dynimport libc·pthread_attr_setstack pthread_attr_setstack "libc.so.1"
++#pragma dynimport libc·pthread_create pthread_create "libc.so.1"
++#pragma dynimport libc·raise raise "libc.so.1"
++#pragma dynimport libc·read read "libc.so.1"
++#pragma dynimport libc·select select "libc.so.1"
++#pragma dynimport libc·sched_yield sched_yield "libc.so.1"
++#pragma dynimport libc·sem_init sem_init "libc.so.1"
++#pragma dynimport libc·sem_post sem_post "libc.so.1"
++#pragma dynimport libc·sem_reltimedwait_np sem_reltimedwait_np "libc.so.1"
++#pragma dynimport libc·sem_wait sem_wait "libc.so.1"
++#pragma dynimport libc·setitimer setitimer "libc.so.1"
++#pragma dynimport libc·sigaction sigaction "libc.so.1"
++#pragma dynimport libc·sigaltstack sigaltstack "libc.so.1"
++#pragma dynimport libc·sigprocmask sigprocmask "libc.so.1"
++#pragma dynimport libc·sysconf sysconf "libc.so.1"
++#pragma dynimport libc·usleep usleep "libc.so.1"
++#pragma dynimport libc·write write "libc.so.1"
+ 
+ extern uintptr libc·___errno;
+ extern uintptr libc·clock_gettime;
+Index: golang/src/runtime/syscall_solaris.c
+===================================================================
+--- golang.orig/src/runtime/syscall_solaris.c
++++ golang/src/runtime/syscall_solaris.c
+@@ -2,22 +2,22 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+-#pragma dynimport libc·chdir chdir "libc.so"
+-#pragma dynimport libc·chroot chroot "libc.so"
+-#pragma dynimport libc·close close "libc.so"
+-#pragma dynimport libc·dlclose dlclose "libc.so"
+-#pragma dynimport libc·dlopen dlopen "libc.so"
+-#pragma dynimport libc·dlsym dlsym "libc.so"
+-#pragma dynimport libc·execve execve "libc.so"
+-#pragma dynimport libc·fcntl fcntl "libc.so"
+-#pragma dynimport libc·gethostname gethostname "libc.so"
+-#pragma dynimport libc·ioctl ioctl "libc.so"
+-#pragma dynimport libc·pipe pipe "libc.so"
+-#pragma dynimport libc·setgid setgid "libc.so"
+-#pragma dynimport libc·setgroups setgroups "libc.so"
+-#pragma dynimport libc·setsid setsid "libc.so"
+-#pragma dynimport libc·setuid setuid "libc.so"
+-#pragma dynimport libc·setpgid setsid "libc.so"
+-#pragma dynimport libc·syscall syscall "libc.so"
+-#pragma dynimport libc·forkx forkx "libc.so"
+-#pragma dynimport libc·wait4 wait4 "libc.so"
++#pragma dynimport libc·chdir chdir "libc.so.1"
++#pragma dynimport libc·chroot chroot "libc.so.1"
++#pragma dynimport libc·close close "libc.so.1"
++#pragma dynimport libc·dlclose dlclose "libc.so.1"
++#pragma dynimport libc·dlopen dlopen "libc.so.1"
++#pragma dynimport libc·dlsym dlsym "libc.so.1"
++#pragma dynimport libc·execve execve "libc.so.1"
++#pragma dynimport libc·fcntl fcntl "libc.so.1"
++#pragma dynimport libc·gethostname gethostname "libc.so.1"
++#pragma dynimport libc·ioctl ioctl "libc.so.1"
++#pragma dynimport libc·pipe pipe "libc.so.1"
++#pragma dynimport libc·setgid setgid "libc.so.1"
++#pragma dynimport libc·setgroups setgroups "libc.so.1"
++#pragma dynimport libc·setsid setsid "libc.so.1"
++#pragma dynimport libc·setuid setuid "libc.so.1"
++#pragma dynimport libc·setpgid setsid "libc.so.1"
++#pragma dynimport libc·syscall syscall "libc.so.1"
++#pragma dynimport libc·forkx forkx "libc.so.1"
++#pragma dynimport libc·wait4 wait4 "libc.so.1"
+Index: golang/src/runtime/netpoll_solaris.c
+===================================================================
+--- golang.orig/src/runtime/netpoll_solaris.c
++++ golang/src/runtime/netpoll_solaris.c
+@@ -68,11 +68,11 @@
+ // again we know for sure we are always talking about the same file
+ // descriptor and can safely access the data we want (the event set).
+ 
+-#pragma dynimport libc·fcntl fcntl "libc.so"
+-#pragma dynimport libc·port_create port_create "libc.so"
+-#pragma dynimport libc·port_associate port_associate "libc.so"
+-#pragma dynimport libc·port_dissociate port_dissociate "libc.so"
+-#pragma dynimport libc·port_getn port_getn "libc.so"
++#pragma dynimport libc·fcntl fcntl "libc.so.1"
++#pragma dynimport libc·port_create port_create "libc.so.1"
++#pragma dynimport libc·port_associate port_associate "libc.so.1"
++#pragma dynimport libc·port_dissociate port_dissociate "libc.so.1"
++#pragma dynimport libc·port_getn port_getn "libc.so.1"
+ extern uintptr libc·fcntl;
+ extern uintptr libc·port_create;
+ extern uintptr libc·port_associate;
+Index: golang/src/syscall/zsyscall_solaris_amd64.go
+===================================================================
+--- golang.orig/src/syscall/zsyscall_solaris_amd64.go
++++ golang/src/syscall/zsyscall_solaris_amd64.go
+@@ -6,8 +6,8 @@ package syscall
+ import "unsafe"
+ 
+ var (
+-	modlibc      = newLazySO("libc.so")
+-	modlibsocket = newLazySO("libsocket.so")
++	modlibc      = newLazySO("libc.so.1")
++	modlibsocket = newLazySO("libsocket.so.1")
+ 
+ 	procgetgroups    = modlibc.NewProc("getgroups")
+ 	procsetgroups    = modlibc.NewProc("setgroups")
diff --git a/debian/patches/series b/debian/patches/series
index 3233e2c34..7f19cee0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dyson-EOF.patch
+dyson-libc.patch