fix target libdvbcsa

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 743187fdd345e8df0effda06aba315be15202789..9d4c8a605975ce0f8cf702ced95de594ad1b245a 100755 (executable)
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -99,8 +99,8 @@ ifeq ($(BOXSERIES), hd1)
   TARGET_O_CFLAGS        = -Os
   TARGET_ARCH                   = arm
   TARGET_CPU             = armv6
+  TARGET_ABI             = -march=$(TARGET_CPU) -mfloat-abi=soft -mlittle-endian
   TARGET_ENDIAN          = little
-  TARGET_MARCH_CFLAGS    = -march=$(TARGET_CPU) -mfloat-abi=soft -mlittle-endian
   TARGET_EXTRA_CFLAGS    = -fdata-sections -ffunction-sections
   TARGET_EXTRA_LDFLAGS   = -Wl,--gc-sections
   CXX11_ABI              =
@@ -111,8 +111,8 @@ else ifeq ($(BOXSERIES), hd2)
   TARGET_O_CFLAGS        = -O2
   TARGET_ARCH                   = arm
   TARGET_CPU             = armv7-a
+  TARGET_ABI             = -march=$(TARGET_CPU) -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_ENDIAN          = little
-  TARGET_MARCH_CFLAGS    = -march=$(TARGET_CPU) -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
   ifeq ($(BOXMODEL),kronos_v2)
@@ -128,8 +128,8 @@ else ifeq ($(BOXSERIES),$(filter $(BOXSERIES), hd5x hd6x))
   TARGET_O_CFLAGS        = -O2
   TARGET_ARCH                   = arm
   TARGET_CPU             = armv7ve
+  TARGET_ABI             = -march=$(TARGET_CPU) -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_ENDIAN          = little
-  TARGET_MARCH_CFLAGS    = -march=$(TARGET_CPU) -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
   CXX11_ABI              =
@@ -140,7 +140,7 @@ endif
 
 TARGETLIB        = $(TARGETPREFIX)/lib
 TARGETUSRLIB     = $(TARGETPREFIX)/usr/lib
-TARGET_CFLAGS    = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGETPREFIX)/include
+TARGET_CFLAGS    = -pipe $(TARGET_O_CFLAGS) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGETPREFIX)/include
 TARGET_CPPFLAGS  = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS  = $(TARGET_CFLAGS)
 TARGET_LDFLAGS   = -O1 -Wl,-rpath,$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) -L$(TARGETLIB) $(TARGET_EXTRA_LDFLAGS)

diff --git a/make/libraries.mk b/make/libraries.mk
index 2bbf2dab3280d402d72bcf374833190cae14e692..8728d2f3ad65c7e282df12f2ccbba7f799482c63 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -827,7 +827,9 @@ $(D)/libdvbsi++: $(ARCHIVE)/libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 | $(TARGETPRE
        $(TOUCH)
 
 
-# --enable-uint32 --enable-uint64 --enable-neon
+LIBDVBCSA_CONF_OPTS = \
+       $(if $(findstring neon,$(TARGET_ABI)),--enable-neon,--disable-neon)
+
 $(D)/libdvbcsa: $(ARCHIVE)/libdvbcsa-$(LIBDVBCSA_VER).tar.bz2 | $(TARGETPREFIX)
        $(START_BUILD)
        $(REMOVE)/libdvbcsa-$(LIBDVBCSA_VER)
@@ -840,7 +842,7 @@ $(D)/libdvbcsa: $(ARCHIVE)/libdvbcsa-$(LIBDVBCSA_VER).tar.bz2 | $(TARGETPREFIX)
                        --host=$(TARGET) \
                        --disable-shared \
                        --enable-static \
-                       --enable-neon; \
+                       $(LIBDVBCSA_CONF_OPTS); \
                $(MAKE); \
                $(MAKE) install
        $(REMOVE)/libdvbcsa-$(LIBDVBCSA_VER)