!7 [sync] PR-3: Add pie compile option

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2024-03-29 03:05:33 +00:00 committed by Gitee
commit df3fceb364
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 5f57fa5c6d4bf4b16bfa1313d2918d27192980e6 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 6 Jun 2023 15:00:54 +0800
Subject: [PATCH] add pie compile option
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e65b64c..6373ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,10 @@ BINDIR=$(PREFIX)/bin
all: ttmkfdir
.cpp.o:
- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
+ libtool --mode=compile $(CXX) $(CXXFLAGS) -fPIE -o $@ -c $^
ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
- libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
+ libtool --mode=link $(CXX) -pie -o $@ $^ $(LDFLAGS)
parser.cpp: encoding.l
flex -i -8 -o$@ $<
--
2.33.0

View File

@ -1,7 +1,7 @@
Summary: Utility to create fonts.scale files for truetype fonts
Name: ttmkfdir
Version: 3.0.9
Release: 56
Release: 57
License: LGPLv2+
Source0: %{name}-%{version}.tar.bz2
Source1: ttmkfdir.1
@ -16,6 +16,7 @@ Patch7: ttmkfdir-3.0.9-encoding-dir.patch
Patch8: ttmkfdir-3.0.9-font-scale.patch
Patch9: ttmkfdir-3.0.9-bug434301.patch
Patch10: ttmkfdir-3.0.9-freetype-header-fix2.patch
Patch11: 0001-add-pie-compile-option.patch
BuildRequires: freetype-devel >= 2.0 flex libtool
BuildRequires: bzip2-devel zlib-devel gcc-c++
@ -46,5 +47,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_mandir}/man1/
%{_mandir}/man1/
%changelog
* Tue Jun 06 2023 Ge Wang <wang__ge@126.com> - 3.0.9-57
- Add pie compile option
* Tue Dec 3 2019 mengxian <mengxian@huawei.com> - 3.0.9-56
- Package init