Merge pull request #482 from k-okada/apply_dfsg_patch

apply patches in dfsg

Author: k-okada

.travis.sh

@@ -82,6 +82,8 @@ if [ "$QEMU" != "" ]; then
     export GIT_SSL_NO_VERIFY=1
     git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
     for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
+        # skip patches already applied by https://github.com/euslisp/EusLisp/pull/482
+        [[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch ]] && continue;
         # skip patch already applied by https://github.com/euslisp/EusLisp/pull/441
         if [[ $file =~  fix-for-reprotest.patch ]]; then
             filterdiff -p1 -x 'lisp/image/jpeg/makefile' -x 'lisp/comp/comp.l' < /tmp/euslisp-dfsg/debian/patches/$file > /tmp/euslisp-dfsg/debian/patches/$file-fix

doc/man/eus.1

@@ -1,6 +1,6 @@
 .TH eus 1 "Apr/20/1989"
 .SH NAME
-eus eusx euscomp eusxview eusview \- EusLisp
+eus \- EusLisp
 .SH SYNOPSIS
 .nf
 eus [start-up-files]

lisp/Makefile.Linux

@@ -74,7 +74,7 @@ CFLAGS:= $(CFLAGS) $(CPPFLAGS) $(WFLAGS) -D$(MACHINE) -DLinux -D_REENTRANT -DVER
 
 # machine specific CFLAGS
 ifneq ($(shell gcc -dumpmachine | egrep "^(arm|aarch)"),)
-  ADD_LDFLAGS=-Wl,-z,execstack
+  ADD_LDFLAGS+=-Wl,-z,execstack
   CFLAGS+=-DARM -fPIC
   ARCH=LinuxARM
 endif

lisp/Makefile.Linux64

@@ -67,7 +67,7 @@ CC=gcc
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 # Linux
-RAWLIB=-ldl -lm -lpthread
+RAWLIB=-ldl -lm -lpthread -lc
 XLIB= -L/usr/X11R6/lib -lX11
 
 # specify directories where euslisp's libraries are located.

lisp/Makefile.LinuxARM

@@ -92,7 +92,7 @@ LD=gcc
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 # Linux
-RAWLIB=-ldl -lm -lpthread
+RAWLIB=-ldl -lm -lpthread -lc
 XLIB= -L/usr/X11R6/lib -lX11
 
 # specify directories where euslisp's libraries are located.

lisp/c/loadelf.c

@@ -160,7 +160,7 @@ pointer initnames;
   void *dlhandle;
   char namebuf[256];
 
-  dlhandle=dlopen(0,RTLD_LAZY);
+  dlhandle=dlopen(0,RTLD_LAZY|RTLD_GLOBAL);
   if (dlhandle==NULL) { 
     fprintf(stderr, "cannot dlopen self\n"); exit(2);}
   module_count=0;
@@ -386,7 +386,7 @@ pointer *argv;
     else entry=(char *)get_string(argv[1]);}
   else entry=NULL;
 
-  dlhandle=(eusinteger_t)dlopen(binfn, RTLD_LAZY);/* ???? */
+  dlhandle=(eusinteger_t)dlopen(binfn, RTLD_LAZY|RTLD_GLOBAL);/* ???? */
   if (dlhandle == 0) {
     fprintf(stderr,"BINLOAD cannot dlopen: %s\n", dlerror());
     return(NIL);}