Commit 1d332706 authored by Rafaël Carré's avatar Rafaël Carré

live-armlinux.patch got accepted by upstream

So apply it unconditionally so when the new release is here it will be
spotted and removed faster.
http://lists.live555.com/pipermail/live-devel/2010-February/011820.html
parent b584f3df
...@@ -1217,6 +1217,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz: ...@@ -1217,6 +1217,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
live: live555-$(LIVEDOTCOM_VERSION).tar.gz live: live555-$(LIVEDOTCOM_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p0 < Patches/live-uselocale.patch patch -p0 < Patches/live-uselocale.patch
patch -p0 < Patches/live-armlinux.patch
ifdef HAVE_WIN64 ifdef HAVE_WIN64
patch -p0 < Patches/live-win64.patch patch -p0 < Patches/live-win64.patch
endif endif
...@@ -1240,7 +1241,6 @@ ifdef HAVE_BIGENDIAN ...@@ -1240,7 +1241,6 @@ ifdef HAVE_BIGENDIAN
endif endif
else else
ifeq ($(ARCH),armel) ifeq ($(ARCH),armel)
patch -p0 < Patches/live-armlinux.patch
(cd $<; ./genMakefiles armlinux && make $(HOSTCC)) (cd $<; ./genMakefiles armlinux && make $(HOSTCC))
else else
(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux) (cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
......
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