* [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/
@ 2016-11-26 21:28 José María Alonso
0 siblings, 0 replies; 4+ messages in thread
From: José María Alonso @ 2016-11-26 21:28 UTC (permalink / raw
To: gentoo-commits
commit: e8f718b3e2bcc0989bda3dc5cb0f24f67096f11c
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 21:27:44 2016 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 21:28:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f718b3
app-emulation/free42: Respects LDFLAGS
Package-Manager: portage-2.3.0
.../free42/files/free42-1.5.12-fix-makefile.patch | 27 ++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch
index 3fe1baf..29c3bb5 100644
--- a/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch
@@ -1,6 +1,6 @@
diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile 2016-09-04 18:56:12.000000000 +0200
-+++ b/gtk/Makefile 2016-09-24 16:13:34.824116365 +0200
+--- a/gtk/Makefile 2016-10-04 03:45:02.000000000 +0200
++++ b/gtk/Makefile 2016-11-26 22:06:25.599990576 +0100
@@ -15,11 +15,10 @@
# along with this program; if not, see http://www.gnu.org/licenses/.
###############################################################################
@@ -14,7 +14,7 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
-I/usr/X11R6/include \
$(shell pkg-config --cflags gtk+-2.0) \
-DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,14 +26,16 @@
+@@ -27,21 +26,25 @@
-DDECIMAL_GLOBAL_ROUNDING=1 \
-DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
@@ -31,8 +31,27 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
+ ${CXXFLAGS}
-LDFLAGS = -L/usr/X11R6/lib
-+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
++MYLDFLAGS = -L/usr/X11R6/lib
-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
++MYLDFLAGS += -Wl,--hash-style=both
+ LIBS += -lpthread
+ endif
+
++MYLDFLAGS += ${LDFLAGS}
++
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+ core_commands3.cc core_commands4.cc core_commands5.cc \
+@@ -83,7 +86,7 @@
+ endif
+
+ $(EXE): $(OBJS)
+- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
++ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
+
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/
@ 2017-02-02 14:18 José María Alonso
0 siblings, 0 replies; 4+ messages in thread
From: José María Alonso @ 2017-02-02 14:18 UTC (permalink / raw
To: gentoo-commits
commit: b2a49de72b3773221adb89fce881dc25a22495a9
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 14:17:07 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 14:17:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a49de7
app-emulation/free42: Removes compiler warning.
Fixes bug #595076
Package-Manager: portage-2.3.3
app-emulation/free42/files/free42-1.5.13-fix-makefile.patch | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
index 29c3bb5..bc7cf3f 100644
--- a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
@@ -1,7 +1,7 @@
diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile 2016-10-04 03:45:02.000000000 +0200
-+++ b/gtk/Makefile 2016-11-26 22:06:25.599990576 +0100
-@@ -15,11 +15,10 @@
+--- a/gtk/Makefile 2017-01-22 22:03:38.000000000 +0100
++++ b/gtk/Makefile 2017-02-02 15:08:32.589997985 +0100
+@@ -15,11 +15,11 @@
# along with this program; if not, see http://www.gnu.org/licenses/.
###############################################################################
@@ -11,10 +11,11 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
-Wno-parentheses \
-Wno-write-strings \
- -g \
++ -Wno-error=narrowing \
-I/usr/X11R6/include \
$(shell pkg-config --cflags gtk+-2.0) \
-DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +26,25 @@
+@@ -27,21 +27,25 @@
-DDECIMAL_GLOBAL_ROUNDING=1 \
-DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
@@ -31,8 +32,8 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
+ ${CXXFLAGS}
-LDFLAGS = -L/usr/X11R6/lib
-+MYLDFLAGS = -L/usr/X11R6/lib
-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++MYLDFLAGS = -L/usr/X11R6/lib
+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
ifeq "$(shell uname -s)" "Linux"
@@ -46,7 +47,7 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +86,7 @@
+@@ -83,7 +87,7 @@
endif
$(EXE): $(OBJS)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/
@ 2024-05-03 11:26 Bernard Cafarelli
0 siblings, 0 replies; 4+ messages in thread
From: Bernard Cafarelli @ 2024-05-03 11:26 UTC (permalink / raw
To: gentoo-commits
commit: aaab19078dbaf65174a5104a1e5b1972c454d461
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri May 3 11:25:34 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri May 3 11:26:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaab1907
app-emulation/free42: properly use $AR
Closes: https://bugs.gentoo.org/931084
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
index 283c6c1435be..304f20ec83b2 100644
--- a/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
@@ -15,7 +15,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
# Hack to support FreeBSD; not 100% sure what this does, but it produces a
# library that passes all tests.
-@@ -64,8 +57,11 @@
+@@ -64,8 +57,10 @@
;;
esac
@@ -23,8 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
+
cd LIBRARY
-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+echo $MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a AR_CMD="$AR rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
mv libbid.a ../../gcc111libbid.a
cd ../..
( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/
@ 2024-05-04 7:55 Bernard Cafarelli
0 siblings, 0 replies; 4+ messages in thread
From: Bernard Cafarelli @ 2024-05-04 7:55 UTC (permalink / raw
To: gentoo-commits
commit: af6f5b33121ad871e9debf8f7c109ef24370a94b
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat May 4 07:54:51 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat May 4 07:55:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6f5b33
app-emulation/free42: also handle unset $AR
Bug: https://bugs.gentoo.org/931146
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
index 304f20ec83b2..c9cde2fbda2c 100644
--- a/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch
@@ -23,7 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
+
cd LIBRARY
-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+$MK $OS_ARG A=a AR_CMD="$AR rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a AR_CMD="${AR:-ar} rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
mv libbid.a ../../gcc111libbid.a
cd ../..
( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-04 7:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-26 21:28 [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/ José María Alonso
-- strict thread matches above, loose matches on Subject: below --
2017-02-02 14:18 José María Alonso
2024-05-03 11:26 Bernard Cafarelli
2024-05-04 7:55 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox