Skip to content

Commit 01fc357

Browse files
authored
Merge pull request #523 from k-okada/fix-for-blhc
Fix for blhf Fix for blhc tests, we need to use default CFLAGS
2 parents f27fba2 + 769f128 commit 01fc357

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.travis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ if [[ "$QEMU" != "" ]]; then
9595
export GIT_SSL_NO_VERIFY=1
9696
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
9797
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
98-
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/525
99-
[[ $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|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-ppc64el-test.patch ]] && continue;
98+
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/523, https://github.com/euslisp/EusLisp/pull/525
99+
[[ $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|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-ppc64el-test.patch|fix-for-blhc.patch ]] && continue;
100100
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509, https://github.com/euslisp/EusLisp/pull/512, https://github.com/euslisp/EusLisp/pull/514, https://github.com/euslisp/EusLisp/pull/517
101101
if [[ $file =~ fix-for-reprotest.patch ]]; then
102102
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

lisp/comp/comp.l

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
(eval-when (load eval)
2525

2626
(defparameter *coptflags* "")
27-
(defparameter *cflags* "")
27+
(defparameter *cflags* (format nil " ~A" (or (unix::getenv "CFLAGS") "")))
2828
(defparameter *defun-list* nil)
2929
(defparameter *verbose* nil)
3030
(defparameter *optimize* 2)
@@ -1264,7 +1264,6 @@
12641264
(setq file (merge-pathnames ".l" file))
12651265
(if (null (probe-file file))
12661266
(error "file ~A not found~%" file)))
1267-
(warn "compiling file: ~A~%" (namestring file))
12681267
(setq ins (open file))
12691268
(setq *defun-list* nil)
12701269
(when *multipass-optimize*

0 commit comments

Comments
 (0)