summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-19 01:08:28 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-02 16:33:20 +0000
commiteba7edc7136f9ce46a08ef0cd8385edd78fb981c (patch)
treeabd9d368f6d5e9008525e316538e1f22dee0ee18
parentaea9c482565d0caab464768b07598fede0f5f98e (diff)
x11-libs/cairo : use U_FORTIFY_SOURCE (fix build with tc)
-rw-r--r--conf/intel/portage/env/noparallelmake.conf8
-rw-r--r--conf/intel/portage/env/ufortify.conf5
-rw-r--r--conf/intel/portage/package.env/00-sys.package.env1
-rw-r--r--conf/intel/portage/package.env/00-x11.package.env1
4 files changed, 11 insertions, 4 deletions
diff --git a/conf/intel/portage/env/noparallelmake.conf b/conf/intel/portage/env/noparallelmake.conf
index 9f33a2c..5f09bbe 100644
--- a/conf/intel/portage/env/noparallelmake.conf
+++ b/conf/intel/portage/env/noparallelmake.conf
@@ -1,5 +1,5 @@
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j1 -s"
+MAKEOPTS="-j1"
diff --git a/conf/intel/portage/env/ufortify.conf b/conf/intel/portage/env/ufortify.conf
new file mode 100644
index 0000000..5884c4a
--- /dev/null
+++ b/conf/intel/portage/env/ufortify.conf
@@ -0,0 +1,5 @@
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-U_FORTIFY_SOURCE"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-U_FORTIFY_SOURCE"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
+CHOST="x86_64-pc-linux-gnu"
+MAKEOPTS="-j10"
diff --git a/conf/intel/portage/package.env/00-sys.package.env b/conf/intel/portage/package.env/00-sys.package.env
index 849a347..05c5a5e 100644
--- a/conf/intel/portage/package.env/00-sys.package.env
+++ b/conf/intel/portage/package.env/00-sys.package.env
@@ -1 +1,2 @@
sys-fs/dmraid noparallelmake.conf
+sys-libs/glibc ufortify.conf
diff --git a/conf/intel/portage/package.env/00-x11.package.env b/conf/intel/portage/package.env/00-x11.package.env
new file mode 100644
index 0000000..2dde2c5
--- /dev/null
+++ b/conf/intel/portage/package.env/00-x11.package.env
@@ -0,0 +1 @@
+x11-libs/cairo ufortify.conf