summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2018-02-24 00:17:57 +0000
committerThomas Preud'homme <robotux@celest.fr>2018-02-24 00:17:57 +0000
commit22d832aeb76e25b0843a1e8083ae0bc5d3f767f1 (patch)
treee5e4b2f996d03aecf21f2574b8302a860d73a375 /debian
parentdb0e908901dd5fbb0b3725ca669a6e8d8cb34505 (diff)
parent09f0871781d6462279d3ea97db05b0cc4d77d4d2 (diff)
merge patched into master
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/0002-Disable-stack-protector-in-runtime-library.patch8
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 699a551..9d48a89 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-f4ab37b20a5b328cd681740fb2eed649d994b8c1
-f4ab37b20a5b328cd681740fb2eed649d994b8c1
+09f0871781d6462279d3ea97db05b0cc4d77d4d2
+09f0871781d6462279d3ea97db05b0cc4d77d4d2
e2ccf3981d78dfeb390d22c74625b60310100abb
e2ccf3981d78dfeb390d22c74625b60310100abb
tcc_0.9.27.orig.tar.bz2
diff --git a/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch
index 243bc23..35732fc 100644
--- a/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch
+++ b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch
@@ -1,4 +1,4 @@
-From f4ab37b20a5b328cd681740fb2eed649d994b8c1 Mon Sep 17 00:00:00 2001
+From 09f0871781d6462279d3ea97db05b0cc4d77d4d2 Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <robotux@celest.fr>
Date: Sun, 17 Feb 2013 23:39:08 +0100
Subject: Disable stack protector in runtime library
@@ -9,20 +9,20 @@ when libtcc1.a is build with -fstack-protector.
Origin: vendor
Forwarded: no
-Last-Update: 2018-02-21
+Last-Update: 2018-02-24
---
lib/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/Makefile b/lib/Makefile
-index 0c1ec54d..385ffae4 100644
+index 0c1ec54d..be0e6485 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -20,6 +20,7 @@ XCFG = $(or $(findstring -win,$T),-unx)
# in order to use gcc, tyoe: make <target>-libtcc1-usegcc=yes
arm-libtcc1-usegcc ?= no
-+CFLAGS:=$(filter-out -fstack-protector%,$(CFLAGS))
++CFLAGS:=$(CFLAGS) -fstack-protector
ifeq "$($(T)-libtcc1-usegcc)" "yes"
XCC = $(CC)
XAR = $(AR)