diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-03-09 20:12:37 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-03-09 20:12:37 +0000 |
| commit | bb1b7e4a8aab0f5d494f4ae7c6e4b0923bcd64f9 (patch) | |
| tree | 94095d2d434024c4c52fd74f67090a5dc341ba64 | |
| parent | c75f91d5b03139ab85e3f7f43ab5683acccb1c32 (diff) | |
| parent | 55cae8e439664b764d4bd11306c754c97f0df15d (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
4 files changed, 30 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 764dbbc..f87d9dc 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -7c2261b8eef7a22a9a33a73d0a5f12039973ed5b -7c2261b8eef7a22a9a33a73d0a5f12039973ed5b +55cae8e439664b764d4bd11306c754c97f0df15d +55cae8e439664b764d4bd11306c754c97f0df15d e2ccf3981d78dfeb390d22c74625b60310100abb e2ccf3981d78dfeb390d22c74625b60310100abb tcc_0.9.27.orig.tar.bz2 diff --git a/debian/patches/0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch b/debian/patches/0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch new file mode 100644 index 0000000..09afb87 --- /dev/null +++ b/debian/patches/0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch @@ -0,0 +1,26 @@ +From 55cae8e439664b764d4bd11306c754c97f0df15d Mon Sep 17 00:00:00 2001 +From: Thomas Preud'homme <robotux@celest.fr> +Date: Fri, 9 Mar 2018 20:10:06 +0000 +Subject: Remove asm-c-connect-sep in tests clean target + +Origin: vendor +Forwarded: http://repo.or.cz/tinycc.git/commit/e76058c478f37f22998fc59044f8cbbf59a66584 +Last-Update: 2018-03-09 +Applied-Upstream: commit:e76058c478f37f22998fc59044f8cbbf59a66584 +--- + tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 5f6777d7..d3c49fb9 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -279,7 +279,7 @@ cache: tcc_g + clean: + rm -f *~ *.o *.a *.bin *.i *.ref *.out *.out? *.out?b *.cc *.gcc + rm -f *-cc *-gcc *-tcc *.exe hello libtcc_test vla_test tcctest[1234] +- rm -f asm-c-connect$(EXESUF) ++ rm -f asm-c-connect$(EXESUF) asm-c-connect-sep$(EXESUF) + rm -f ex? tcc_g weaktest.*.txt *.def + @$(MAKE) -C tests2 $@ + @$(MAKE) -C pp $@ diff --git a/debian/patches/series b/debian/patches/series index 5a658b6..59f1f22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Disable-stack-protector-in-runtime-library.patch 0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch 0004-Fix-pthread-option-handling.patch +0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch diff --git a/tests/Makefile b/tests/Makefile index 5f6777d..d3c49fb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -279,7 +279,7 @@ cache: tcc_g clean: rm -f *~ *.o *.a *.bin *.i *.ref *.out *.out? *.out?b *.cc *.gcc rm -f *-cc *-gcc *-tcc *.exe hello libtcc_test vla_test tcctest[1234] - rm -f asm-c-connect$(EXESUF) + rm -f asm-c-connect$(EXESUF) asm-c-connect-sep$(EXESUF) rm -f ex? tcc_g weaktest.*.txt *.def @$(MAKE) -C tests2 $@ @$(MAKE) -C pp $@ |