diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
tree | d6a3582523245b624d1a905d4b46d8344429e617 /community-staging/lightspark/llvm29.diff | |
parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'community-staging/lightspark/llvm29.diff')
-rw-r--r-- | community-staging/lightspark/llvm29.diff | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/community-staging/lightspark/llvm29.diff b/community-staging/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community-staging/lightspark/llvm29.diff @@ -0,0 +1,12 @@ +--- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 ++++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 +@@ -152,7 +152,8 @@ + MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") + ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) +- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ ADD_DEFINITIONS(-DLLVM_29) + ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) + ADD_DEFINITIONS(-DLLVM_28) |