From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
Date: Mon, 28 Dec 2015 09:53:58 +0000 (UTC) [thread overview]
Message-ID: <1451258687.4da8aa027a5cc89f46190a0374b04b1cdc182ff5.monsieurp@gentoo> (raw)
commit: 4da8aa027a5cc89f46190a0374b04b1cdc182ff5
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 22:49:39 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:24:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da8aa02
media-video/aegisub: adjust pthread patch wrt bug 568878
- Always append '-lpthread' to LIBS_PTHREAD since build system fails to
do so when needed.
- Add CFLAGS_PTHREAD to libaegisub build since it uses pthreads.
- Remove CFLAGS_PTHREAD from tools build since it does not use pthreads,
but only links with archive that includes pthread symbols.
Gentoo-Bug: 568878
Package-Manager: portage-2.2.24
.../aegisub-3.2.2-add-missing-pthread-flags.patch | 36 ++++++++++++++++++----
.../aegisub-9999-add-missing-pthread-flags.patch | 35 ++++++++++++++-------
2 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
index c1aa14a..ed45de7 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -1,16 +1,40 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c93b9dc..8c5678a 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL = @OPENAL_LIBS@
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD = @PTHREAD_LIBS@
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
+
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 64204ef..178044d 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
+
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/tools/Makefile b/tools/Makefile
-index 81bcef3..f9a6cd3 100644
+index 81bcef3..d9f64b8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
endif
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
PROGRAM += $(d)repack-thes-dict
-
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
index 1d709fe..3631361 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,14 +1,27 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index d9f64b8..f9a6cd3 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -8,7 +8,8 @@ endif
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d1e1da4..699ac77 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL = @OPENAL_LIBS@
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD = @PTHREAD_LIBS@
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
- repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 4efb685..f53c372 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
- PROGRAM += $(d)repack-thes-dict
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
next reply other threads:[~2015-12-28 9:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-28 9:53 Patrice Clement [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-28 9:53 [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/ Patrice Clement
2015-12-28 9:53 Patrice Clement
2016-02-10 22:04 Patrice Clement
2016-02-10 22:04 Patrice Clement
2016-02-13 3:56 Ian Delaney
2016-03-08 2:16 Ian Delaney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451258687.4da8aa027a5cc89f46190a0374b04b1cdc182ff5.monsieurp@gentoo \
--to=monsieurp@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox