]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
extras.mk: fix target davfs2
authorMarkham <markham001@gmx.de>
Sat, 9 Nov 2019 15:08:10 +0000 (16:08 +0100)
committerMarkham <markham001@gmx.de>
Sat, 9 Nov 2019 15:08:10 +0000 (16:08 +0100)
make/extras.mk
make/neutrino.mk

index ffc34694787d4866d27aed8f0f9f4fe897266423..050695188e8c693813db48536c5a9eea0562d678 100644 (file)
@@ -64,13 +64,10 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(BUILD_T
 #      $(REMOVE)/dropbear-$(DROPBEAR_VER)
 #      $(TOUCH)
 
-$(D)/libneon: $(D)/expat $(D)/openssl $(ARCHIVE)/neon-$(NEON_VER).tar.gz
-       #mkdir -p $(BUILD_TMP)/extras_neon
+$(D)/libneon: $(D)/expat $(D)/openssl $(ARCHIVE)/neon-$(NEON_VER).tar.gz | $(TARGETPREFIX)
        $(REMOVE)/neon-$(NEON_VER)
        $(START_BUILD)
        $(UNTAR)/neon-$(NEON_VER).tar.gz
-       #mkdir -p $(BUILD_TMP)/neon-$(NEON_VER); \
-       #cp -fr $(ARCHIVE)/neon-$(NEON_VER)/* $(BUILD_TMP)/neon-$(NEON_VER); \
        pushd $(BUILD_TMP)/neon-$(NEON_VER); \
                $(PATCH)/libneon-openssl-deprecated.patch; \
                export CFLAGS="-I$(TARGETPREFIX)/include" \
@@ -88,9 +85,9 @@ $(D)/libneon: $(D)/expat $(D)/openssl $(ARCHIVE)/neon-$(NEON_VER).tar.gz
        $(REWRITE_LIBTOOL)/libneon.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/neon.pc
        $(REMOVE)/neon-$(NEON_VER)
-#      $(TOUCH)
+       $(TOUCH)
 
-$(D)/davfs2: $(ARCHIVE)/davfs2-$(DAVFS2_VER).tar.gz
+$(D)/davfs2: $(D)/libneon $(ARCHIVE)/davfs2-$(DAVFS2_VER).tar.gz | $(TARGETPREFIX)
        mkdir -p $(BUILD_TMP)/extras_webdav
        $(REMOVE)/davfs2-$(DAVFS2_VER)
        $(START_BUILD)
@@ -110,6 +107,6 @@ $(D)/davfs2: $(ARCHIVE)/davfs2-$(DAVFS2_VER).tar.gz
                        --sysconfdir="/var/etc" \
                        --with-neon=$(TARGETPREFIX) && \
                $(MAKE) && \
-               $(MAKE) install DESTDIR=$(BUILD_TMP)/extras_webdav
+               $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REMOVE)/davfs2-$(DAVFS2_VER)
-#      $(TOUCH)
+       $(TOUCH)
index 5a36fccc140e5cfbae4f0caeca2bea6866a32266..253e6311f763f1d79183a3a6747a436fe60d9573 100755 (executable)
@@ -28,7 +28,7 @@ N_CFLAGS += -I$(NEUTRINO_OBJDIR)
 N_CFLAGS += -I$(NEUTRINO_OBJDIR)/src/gui
 
 ifeq ($(DEBUG), yes)
-       N_CFLAGS += -O1 -ggdb3 -rdynamic
+       N_CFLAGS += -O0 -g -ggdb3 -rdynamic
 else
        N_CFLAGS += $(TARGET_CFLAGS)
 endif
@@ -103,6 +103,7 @@ endif
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), h7 hd2 hd51 bre2ze4k))
 NEUTRINO_DEPS += $(D)/mc
 NEUTRINO_DEPS += $(D)/rsync
+NEUTRINO_DEPS += $(D)/davfs2
 endif
 NEUTRINO_DEPS += $(D)/libdvdcss
 NEUTRINO_DEPS += $(D)/dvdreadfs