Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (5766af0bbd4298e0d0be7944a81d9cdd603ce014)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (5766af0bbd4298e0d0be7944a81d9cdd603ce014)
  • Date: Wed, 29 Jan 2020 20:04:06 +0000

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +++
FUNCTIONS | 21 ++++++++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 5766af0bbd4298e0d0be7944a81d9cdd603ce014
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

FUNCTIONS: filter -fno-plt in disable_pic

diff --git a/ChangeLog b/ChangeLog
index c2a5626..bfb79b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2020-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FUNCTIONS: filter -fno-plt in disable_pic
+
2019-11-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* FUNCTIONS: install to /usr/games and /usr/share/games when using
cmake
diff --git a/FUNCTIONS b/FUNCTIONS
index 8a4bbd9..f397166 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -248,22 +248,33 @@ function verify_file() {


#---
+## disable_no_plt
+## A function for disabling -fno-plt
+#---
+disable_no_plt() {
+ CFLAGS=${CFLAGS//-fno-plt} &&
+ CXXFLAGS=${CXXFLAGS//-fno-plt}
+}
+
+#---
## disable_pic
## A function to smartly disable -DPIC and -fPIC flags
## has one optional parameter: force which forces disable
#---
+
disable_pic() {
if [[ "${SMGL_COMPAT_ARCHS[1]}" != "x86_64" ]] &&
[[ "${SMGL_COMPAT_ARCHS[1]}" != "em64t" ]] &&
[[ "${SMGL_COMPAT_ARCHS[1]}" != "alpha" ]] ||
[[ "$1" == "force" ]]
then
- CFLAGS=${CFLAGS/-fPIC} &&
- CFLAGS=${CFLAGS/-DPIC} &&
- CXXFLAGS=${CXXFLAGS/-fPIC} &&
- CXXFLAGS=${CXXFLAGS/-DPIC}
+ CFLAGS=${CFLAGS//-fPIC} &&
+ CFLAGS=${CFLAGS//-DPIC} &&
+ CXXFLAGS=${CXXFLAGS//-fPIC} &&
+ CXXFLAGS=${CXXFLAGS//-DPIC} &&
+ disable_no_plt
fi
-}
+}

#
## Function to check if we're using xorg-modular libs or not



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (5766af0bbd4298e0d0be7944a81d9cdd603ce014), Florian Franzmann, 01/29/2020

Archive powered by MHonArc 2.6.24.

Top of Page