diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-12-22 08:05:24 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-12-22 08:07:21 +0800 |
| commit | 11ee5c872af6eb66515dd0896daff4ba9235693c (patch) | |
| tree | c4fd8dfb64e1b8a493da78a56a877d5bba5546f4 | |
| parent | net-nntp/nzbget: Version bump. Fixes bug 550486. (diff) | |
| parent | media-video/aegisub: add missing pthread flags (diff) | |
| download | gentoo-11ee5c872af6eb66515dd0896daff4ba9235693c.tar.gz gentoo-11ee5c872af6eb66515dd0896daff4ba9235693c.tar.bz2 gentoo-11ee5c872af6eb66515dd0896daff4ba9235693c.zip | |
Merge remote-tracking branch 'remotes/Coacher/aegisub-bug-568878'
Pull request: https://github.com/gentoo/gentoo/pull/499
4 files changed, 32 insertions, 0 deletions
diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild index 185e7f1d35a3..19b2dc61bd40 100644 --- a/media-video/aegisub/aegisub-3.2.2.ebuild +++ b/media-video/aegisub/aegisub-3.2.2.ebuild @@ -63,6 +63,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${P}-fix-lua-regexp.patch" "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-add-missing-pthread-flags.patch" "${FILESDIR}/${P}-respect-user-compiler-flags.patch" ) diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index c678b5f54632..6f6eb8c43a75 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -60,6 +60,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch" "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-add-missing-pthread-flags.patch" "${FILESDIR}/${P}-respect-user-compiler-flags.patch" ) 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 new file mode 100644 index 000000000000..c1aa14a3c83c --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch @@ -0,0 +1,16 @@ +diff --git a/tools/Makefile b/tools/Makefile +index 81bcef3..f9a6cd3 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -7,8 +7,9 @@ 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) + + 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 new file mode 100644 index 000000000000..1d709fe18fdd --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch @@ -0,0 +1,14 @@ +diff --git a/tools/Makefile b/tools/Makefile +index d9f64b8..f9a6cd3 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -8,7 +8,8 @@ endif + + 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) + + PROGRAM += $(d)repack-thes-dict + |