Commit 933ef4c7 authored by Olivier Gambier's avatar Olivier Gambier Committed by Jean-Baptiste Kempf

Fixing weak alias detection for llvm based compilers

Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
(cherry picked from commit dbedba79a4c61d3ea609a94afa07f4a7ddbf2d59)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent cab29ad8
--- libcaca/caca/caca.h 2011-07-05 00:09:51.000000000 -0700
+++ libcaca.new/caca/caca.h 2011-07-05 00:10:10.000000000 -0700
@@ -645,7 +645,7 @@
# define CACA_DEPRECATED
# endif
-# if defined __GNUC__ && __GNUC__ > 3
+# if !(defined __APPLE__ && defined __llvm__) && defined __GNUC__ && __GNUC__ > 3
# define CACA_ALIAS(x) __attribute__ ((weak, alias(#x)))
# else
# define CACA_ALIAS(x)
...@@ -17,6 +17,8 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca ...@@ -17,6 +17,8 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch $(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
endif endif
$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/caca/caca-win32-static.patch $(APPLY) $(SRC)/caca/caca-win32-static.patch
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment