Bump buildroot to 2019.02
This commit is contained in:
@@ -12,6 +12,10 @@ Subject: [PATCH] Adjust for buildroot build.
|
||||
- add gpio-static linking target
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
|
||||
- Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
|
||||
|
||||
Signed-off-by: Atanas Palavrov <palavrov@gmail.com>
|
||||
---
|
||||
devLib/Makefile | 9 +++++----
|
||||
gpio/Makefile | 14 +++++++++-----
|
||||
@@ -54,7 +58,7 @@ index cf665d6..3fb41e8 100644
|
||||
|
||||
.PHONY: install-static
|
||||
diff --git a/gpio/Makefile b/gpio/Makefile
|
||||
index f41a005..7095fa5 100644
|
||||
index 9ec160d..360d64c 100644
|
||||
--- a/gpio/Makefile
|
||||
+++ b/gpio/Makefile
|
||||
@@ -32,11 +32,11 @@ endif
|
||||
@@ -89,7 +93,7 @@ index f41a005..7095fa5 100644
|
||||
$Q echo [Compile] $<
|
||||
$Q $(CC) -c $(CFLAGS) $< -o $@
|
||||
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
|
||||
index e1868b9..68c950e 100644
|
||||
index 287fa58..81595d3 100644
|
||||
--- a/wiringPi/Makefile
|
||||
+++ b/wiringPi/Makefile
|
||||
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
|
||||
@@ -102,10 +106,10 @@ index e1868b9..68c950e 100644
|
||||
DEFS = -D_GNU_SOURCE
|
||||
-CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC
|
||||
|
||||
LIBS = -lm -lpthread -lrt -lcrypt
|
||||
|
||||
@@ -79,6 +79,7 @@ $(STATIC): $(OBJ)
|
||||
@@ -76,6 +76,7 @@ static:
|
||||
$(DYNAMIC): $(OBJ)
|
||||
$Q echo "[Link (Dynamic)]"
|
||||
$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
|
||||
@@ -113,7 +117,7 @@ index e1868b9..68c950e 100644
|
||||
|
||||
.c.o:
|
||||
$Q echo [Compile] $<
|
||||
@@ -104,7 +105,7 @@ install: $(DYNAMIC)
|
||||
@@ -101,7 +102,7 @@ install: $(DYNAMIC)
|
||||
$Q echo "[Install Dynamic Lib]"
|
||||
$Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
|
||||
$Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
|
||||
@@ -121,7 +125,7 @@ index e1868b9..68c950e 100644
|
||||
+ $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so
|
||||
$Q $(LDCONFIG)
|
||||
|
||||
.PHONY: install-static
|
||||
.PHONY: install-deb
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_WIRINGPI
|
||||
bool "wiringpi"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
@@ -7,6 +8,6 @@ config BR2_PACKAGE_WIRINGPI
|
||||
|
||||
http://wiringpi.com/
|
||||
|
||||
comment "wiringpi needs a toolchain w/ threads"
|
||||
comment "wiringpi needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
|
||||
sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz
|
||||
|
||||
@@ -4,42 +4,27 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# using git commit id instead of (wrong) 2.44 git tag (Bug 10391)
|
||||
WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
|
||||
WIRINGPI_VERSION = 2.46
|
||||
WIRINGPI_SITE = git://git.drogon.net/wiringPi
|
||||
|
||||
WIRINGPI_LICENSE = LGPL-3.0+
|
||||
WIRINGPI_LICENSE_FILES = COPYING.LESSER
|
||||
WIRINGPI_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
WIRINGPI_LIB_BUILD_TARGETS = static
|
||||
WIRINGPI_LIB_INSTALL_TARGETS = install-static
|
||||
WIRINGPI_BIN_BUILD_TARGETS = gpio-static
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
WIRINGPI_LIB_BUILD_TARGETS = all
|
||||
WIRINGPI_LIB_INSTALL_TARGETS = install
|
||||
WIRINGPI_BIN_BUILD_TARGETS = all
|
||||
else
|
||||
WIRINGPI_LIB_BUILD_TARGETS = all static
|
||||
WIRINGPI_LIB_INSTALL_TARGETS = install install-static
|
||||
WIRINGPI_BIN_BUILD_TARGETS = all
|
||||
endif
|
||||
|
||||
define WIRINGPI_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_BUILD_TARGETS)
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_BUILD_TARGETS)
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio $(WIRINGPI_BIN_BUILD_TARGETS)
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi all
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib all
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio all
|
||||
endef
|
||||
|
||||
define WIRINGPI_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
|
||||
endef
|
||||
|
||||
define WIRINGPI_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
|
||||
$(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio
|
||||
$(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user