summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch')
-rw-r--r--media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch16
1 files changed, 8 insertions, 8 deletions
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 363136134e84..720211afb507 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,27 +1,27 @@
diff --git a/Makefile.inc.in b/Makefile.inc.in
-index d1e1da4..699ac77 100644
+index 5a52d25..86f93d1 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
-@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+@@ -100,7 +100,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
-
+ LIBS_UCHARDET = @UCHARDET_LIBS@
+
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
+index b021523..77a18ec 100644
--- a/libaegisub/Makefile
+++ b/libaegisub/Makefile
@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
endif
-
+
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.o_FLAGS := $(CFLAGS_UCHARDET)
$(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
- $(d)common/parser.o_FLAGS := -ftemplate-depth=256