| 1 |
commit: 4da8aa027a5cc89f46190a0374b04b1cdc182ff5 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 27 22:49:39 2015 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 23:24:47 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da8aa02 |
| 7 |
|
| 8 |
media-video/aegisub: adjust pthread patch wrt bug 568878 |
| 9 |
|
| 10 |
- Always append '-lpthread' to LIBS_PTHREAD since build system fails to |
| 11 |
do so when needed. |
| 12 |
- Add CFLAGS_PTHREAD to libaegisub build since it uses pthreads. |
| 13 |
- Remove CFLAGS_PTHREAD from tools build since it does not use pthreads, |
| 14 |
but only links with archive that includes pthread symbols. |
| 15 |
|
| 16 |
Gentoo-Bug: 568878 |
| 17 |
|
| 18 |
Package-Manager: portage-2.2.24 |
| 19 |
|
| 20 |
.../aegisub-3.2.2-add-missing-pthread-flags.patch | 36 ++++++++++++++++++---- |
| 21 |
.../aegisub-9999-add-missing-pthread-flags.patch | 35 ++++++++++++++------- |
| 22 |
2 files changed, 54 insertions(+), 17 deletions(-) |
| 23 |
|
| 24 |
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 |
| 25 |
index c1aa14a..ed45de7 100644 |
| 26 |
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch |
| 27 |
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch |
| 28 |
@@ -1,16 +1,40 @@ |
| 29 |
+diff --git a/Makefile.inc.in b/Makefile.inc.in |
| 30 |
+index c93b9dc..8c5678a 100644 |
| 31 |
+--- a/Makefile.inc.in |
| 32 |
++++ b/Makefile.inc.in |
| 33 |
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@ |
| 34 |
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a |
| 35 |
+ LIBS_OPENAL = @OPENAL_LIBS@ |
| 36 |
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ |
| 37 |
+-LIBS_PTHREAD = @PTHREAD_LIBS@ |
| 38 |
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread |
| 39 |
+ |
| 40 |
+ ifeq (yes, $(BUILD_DARWIN)) |
| 41 |
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so |
| 42 |
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile |
| 43 |
+index 64204ef..178044d 100644 |
| 44 |
+--- a/libaegisub/Makefile |
| 45 |
++++ b/libaegisub/Makefile |
| 46 |
+@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o |
| 47 |
+ endif |
| 48 |
+ |
| 49 |
+ aegisub_PCH := $(d)lagi_pre.h |
| 50 |
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 51 |
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \ |
| 52 |
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 53 |
+ |
| 54 |
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV) |
| 55 |
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256 |
| 56 |
diff --git a/tools/Makefile b/tools/Makefile |
| 57 |
-index 81bcef3..f9a6cd3 100644 |
| 58 |
+index 81bcef3..d9f64b8 100644 |
| 59 |
--- a/tools/Makefile |
| 60 |
+++ b/tools/Makefile |
| 61 |
-@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper |
| 62 |
+@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper |
| 63 |
endif |
| 64 |
|
| 65 |
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a |
| 66 |
-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) |
| 67 |
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
| 68 |
+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) |
| 69 |
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \ |
| 70 |
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD) |
| 71 |
+ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
| 72 |
|
| 73 |
PROGRAM += $(d)repack-thes-dict |
| 74 |
- |
| 75 |
|
| 76 |
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 |
| 77 |
index 1d709fe..3631361 100644 |
| 78 |
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch |
| 79 |
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch |
| 80 |
@@ -1,14 +1,27 @@ |
| 81 |
-diff --git a/tools/Makefile b/tools/Makefile |
| 82 |
-index d9f64b8..f9a6cd3 100644 |
| 83 |
---- a/tools/Makefile |
| 84 |
-+++ b/tools/Makefile |
| 85 |
-@@ -8,7 +8,8 @@ endif |
| 86 |
+diff --git a/Makefile.inc.in b/Makefile.inc.in |
| 87 |
+index d1e1da4..699ac77 100644 |
| 88 |
+--- a/Makefile.inc.in |
| 89 |
++++ b/Makefile.inc.in |
| 90 |
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@ |
| 91 |
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a |
| 92 |
+ LIBS_OPENAL = @OPENAL_LIBS@ |
| 93 |
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ |
| 94 |
+-LIBS_PTHREAD = @PTHREAD_LIBS@ |
| 95 |
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread |
| 96 |
|
| 97 |
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a |
| 98 |
- repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) |
| 99 |
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
| 100 |
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \ |
| 101 |
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD) |
| 102 |
+ ifeq (yes, $(BUILD_DARWIN)) |
| 103 |
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so |
| 104 |
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile |
| 105 |
+index 4efb685..f53c372 100644 |
| 106 |
+--- a/libaegisub/Makefile |
| 107 |
++++ b/libaegisub/Makefile |
| 108 |
+@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o |
| 109 |
+ endif |
| 110 |
|
| 111 |
- PROGRAM += $(d)repack-thes-dict |
| 112 |
+ aegisub_PCH := $(d)lagi_pre.h |
| 113 |
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 114 |
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \ |
| 115 |
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 116 |
|
| 117 |
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV) |
| 118 |
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256 |
Archives