summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-11 23:50:40 +0000
committerKarl Berry <karl@freefriends.org>2007-10-11 23:50:40 +0000
commit98def1e8ce2ab1ffa0aa3895df12ed38e423bc75 (patch)
treef5b6ca82b0f946cad5d91680f812d57d25acacf3 /Build
parentb0400383578d567f8fdffcb7fced2fb1b6a1b982 (diff)
non-executable stack, link with zlib (Alexis Ballier, 9 Oct 2007 00:21:59)
git-svn-id: svn://tug.org/texlive/trunk@5162 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu-xetex/tools/genccode/genccode.c1
-rw-r--r--Build/source/libs/teckit/lib/Makefile.am3
2 files changed, 4 insertions, 0 deletions
diff --git a/Build/source/libs/icu-xetex/tools/genccode/genccode.c b/Build/source/libs/icu-xetex/tools/genccode/genccode.c
index 84360c4cd0f..5a3eacd4224 100644
--- a/Build/source/libs/icu-xetex/tools/genccode/genccode.c
+++ b/Build/source/libs/icu-xetex/tools/genccode/genccode.c
@@ -149,6 +149,7 @@ static const struct AssemblyType {
} assemblyHeader[] = {
{"gcc",
".globl %s\n"
+ "\t.section .note.GNU-stack,\"\",@progbits\n"
"\t.section .rodata\n"
"\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
"\t.type %s,@object\n"
diff --git a/Build/source/libs/teckit/lib/Makefile.am b/Build/source/libs/teckit/lib/Makefile.am
index 3e6ef5dc171..102cdad4517 100644
--- a/Build/source/libs/teckit/lib/Makefile.am
+++ b/Build/source/libs/teckit/lib/Makefile.am
@@ -10,5 +10,8 @@ AM_CFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = libTECkit_Compiler.la libTECkit.la
+libTECkit_Compiler_la_LIBADD = @LDZLIB@
+libTECkit_la_LIBADD = @LDZLIB@
+
include ../source/Makefile.am