Skip to content

Commit c376868

Browse files
authored
Merge pull request #423 from k-okada/add_dfsg_test
2 parents f370dfd + 529679e commit c376868

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.travis.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fi
6060
### for multiarch compile test
6161
if [ "$QEMU" != "" ]; then
6262
travis_time_start install.dpkg-dev
63-
apt-get install -qq -y dpkg-dev
63+
apt-get install -qq -y dpkg-dev patchutils
6464
travis_time_end
6565

6666
echo "uname -a : $(uname -a)"
@@ -69,10 +69,23 @@ if [ "$QEMU" != "" ]; then
6969
echo "gcc -dumpversion : $(gcc -dumpversion)"
7070
echo "getconf LONG_BIT : $(getconf LONG_BIT)"
7171

72+
travis_time_start download.euslisp-debian
73+
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
74+
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
75+
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441
76+
if [[ $file =~ fix-for-reprotest.patch ]]; then
77+
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
78+
file=$file-fix
79+
fi
80+
echo $file
81+
patch -p1 < /tmp/euslisp-dfsg/debian/patches/$file
82+
done
83+
travis_time_end
84+
7285
travis_time_start compile.euslisp
7386
export EUSDIR=`pwd`
7487
eval "$(dpkg-buildflags --export=sh)"
75-
make -C lisp -f Makefile.Linux eus0 eus1 eus2 eusg eusx eusgl eus eusjpeg
88+
make
7689
travis_time_end
7790

7891
if [[ `gcc -dumpmachine | egrep "^(arm|aarch)"` != "" ]]; then

lisp/comp/comp.l

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,8 @@
13871387
"; sh4-linux-gcc -shared -o ")
13881388
((memq :ia32 *features*)
13891389
"; ld -melf_i386 -shared -build-id -o ")
1390+
((memq :i386 *features*)
1391+
"; gcc -shared -Xlinker -build-id -o ")
13901392
(t
13911393
"; ld -shared -build-id -o "))
13921394
(namestring file.so)

0 commit comments

Comments
 (0)