8461906db4
Well-formed patch fails to apply - patch v2.6: Hunk #1 FAILED at 1. Hunk #2 FAILED at 23. - patch v2.6.1: can't find file to patch at input line 11 Perhaps you used the wrong -p or --strip option? [snip] No file to patch. Skipping patch. 2 out of 2 hunks ignored Patch failed! Please fix 0001-fix-makefile.patch! Old versions of the tool "patch" cannot handle spaces in filenames. The same does not occur using "patch" v2.7 or any later. Workaround: when a file with space in the name needs to be patched, one or two hooks must be used. A pre-patch or post-extract hook renames the file to replace spaces with underscores. The patch file must be generated using diff between two source-trees that have the file renamed with spaces replaced by underscores. A post-patch hook could rename the file to its original name if needed. Fixes: http://autobuild.buildroot.net/results/8ff/8ff91ab8e52000eb34dd8f662520cf1b31490cf5/ http://autobuild.buildroot.net/results/ea7/ea77d6b23aca0cb1cf527e6c16ddf5eba957a69c/ Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
47 lines
1.3 KiB
Makefile
47 lines
1.3 KiB
Makefile
################################################################################
|
|
#
|
|
# libsoil
|
|
#
|
|
################################################################################
|
|
|
|
LIBSOIL_VERSION = 20080707
|
|
LIBSOIL_SOURCE = soil.zip
|
|
LIBSOIL_SITE = http://www.lonesock.net/files
|
|
LIBSOIL_INSTALL_STAGING = YES
|
|
LIBSOIL_DEPENDENCIES = libgl
|
|
LIBSOIL_LICENSE = Public Domain, MIT
|
|
LIBSOIL_LICENSE_FILES = src/stb_image_aug.c src/image_helper.c
|
|
LIBSOIL_MAKEFILE = ../projects/makefile/alternate_Makefile.txt
|
|
|
|
define LIBSOIL_EXTRACT_CMDS
|
|
$(UNZIP) -d $(@D) $(DL_DIR)/$(LIBSOIL_SOURCE)
|
|
mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D)
|
|
endef
|
|
|
|
define REMOVE_SPACE_FROM_FILENAME
|
|
cd $(@D)/projects/makefile/ && \
|
|
mv "alternate Makefile.txt" alternate_Makefile.txt
|
|
endef
|
|
LIBSOIL_POST_EXTRACT_HOOKS += REMOVE_SPACE_FROM_FILENAME
|
|
|
|
define LIBSOIL_BUILD_CMDS
|
|
$(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \
|
|
-C $(@D)/src
|
|
endef
|
|
|
|
define LIBSOIL_INSTALL_STAGING_CMDS
|
|
$(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \
|
|
DESTDIR=$(STAGING_DIR) install \
|
|
INSTALL=$(INSTALL) \
|
|
-C $(@D)/src
|
|
endef
|
|
|
|
define LIBSOIL_INSTALL_TARGET_CMDS
|
|
$(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \
|
|
DESTDIR=$(TARGET_DIR) install \
|
|
INSTALL=$(INSTALL) \
|
|
-C $(@D)/src
|
|
endef
|
|
|
|
$(eval $(generic-package))
|