75 lines
3.8 KiB
Text
75 lines
3.8 KiB
Text
- fix arch/endian detection, machine/endian.h includes some asm that
|
|
isn't stripped by upstream's pipeline
|
|
|
|
- OpenBSD clock_gettime is in libc not librt
|
|
|
|
- use patched pciutils
|
|
|
|
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -106,7 +106,7 @@ endif
|
|
# IMPORTANT: The following line must be placed before TARGET_OS is ever used
|
|
# (of course), but should come after any lines setting CC because the line
|
|
# below uses CC itself.
|
|
-override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
|
|
+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"' | tail -1))
|
|
|
|
ifeq ($(TARGET_OS), Darwin)
|
|
override CPPFLAGS += -I/opt/local/include -I/usr/local/include
|
|
@@ -421,8 +421,8 @@ endif
|
|
# IMPORTANT: The following line must be placed before ARCH is ever used
|
|
# (of course), but should come after any lines setting CC because the line
|
|
# below uses CC itself.
|
|
-override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
|
|
-override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#'))
|
|
+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"' | tail -1))
|
|
+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#' | tail -1))
|
|
|
|
# Disable the internal programmer on unsupported architectures (everything but x86 and mipsel)
|
|
ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN))
|
|
@@ -1120,7 +1120,6 @@ FEATURE_CFLAGS += $(call debug_shell,grep -q "UTSNAME
|
|
FEATURE_LIBS += $(call debug_shell,grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz")
|
|
|
|
FEATURE_CFLAGS += $(call debug_shell,grep -q "CLOCK_GETTIME := yes" .features && printf "%s" "-D'HAVE_CLOCK_GETTIME=1'")
|
|
-FEATURE_LIBS += $(call debug_shell,grep -q "CLOCK_GETTIME := yes" .features && printf "%s" "-lrt")
|
|
|
|
LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
|
|
OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS)
|
|
@@ -1198,11 +1197,7 @@ endif
|
|
define LIBPCI_TEST
|
|
/* Avoid a failing test due to libpci header symbol shadowing breakage */
|
|
#define index shadow_workaround_index
|
|
-#if !defined __NetBSD__
|
|
-#include <pci/pci.h>
|
|
-#else
|
|
-#include <pciutils/pci.h>
|
|
-#endif
|
|
+#include "pciutils/lib/pci.h"
|
|
struct pci_access *pacc;
|
|
int main(int argc, char **argv)
|
|
{
|
|
@@ -1217,11 +1212,7 @@ export LIBPCI_TEST
|
|
define PCI_GET_DEV_TEST
|
|
/* Avoid a failing test due to libpci header symbol shadowing breakage */
|
|
#define index shadow_workaround_index
|
|
-#if !defined __NetBSD__
|
|
-#include <pci/pci.h>
|
|
-#else
|
|
-#include <pciutils/pci.h>
|
|
-#endif
|
|
+#include "pciutils/lib/pci.h"
|
|
struct pci_access *pacc;
|
|
struct pci_dev *dev = {0};
|
|
int main(int argc, char **argv)
|
|
@@ -1529,8 +1520,8 @@ endif
|
|
( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) } 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE)
|
|
@printf "Checking for clock_gettime support... " | tee -a $(BUILD_DETAILS_FILE)
|
|
@echo "$$CLOCK_GETTIME_TEST" >.featuretest.c
|
|
- @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -lrt .featuretest.c -o .featuretest$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE)
|
|
- @ { $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -lrt .featuretest.c -o .featuretest$(EXEC_SUFFIX) >&2 && \
|
|
+ @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE)
|
|
+ @ { $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >&2 && \
|
|
( echo "found."; echo "CLOCK_GETTIME := yes" >>.features.tmp ) || \
|
|
( echo "not found."; echo "CLOCK_GETTIME := no" >>.features.tmp ) } \
|
|
2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE)
|