From patchwork Wed Jun 27 19:21:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 935682 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41GCTR444fz9rx7 for ; Thu, 28 Jun 2018 05:22:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5232686BBD; Wed, 27 Jun 2018 19:22:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GxQOio9IcP4m; Wed, 27 Jun 2018 19:21:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7AD6A86896; Wed, 27 Jun 2018 19:21:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 15EAA1C08C1 for ; Wed, 27 Jun 2018 19:21:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 12E4786523 for ; Wed, 27 Jun 2018 19:21:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dJ7QsTJJYyZb for ; Wed, 27 Jun 2018 19:21:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id BCBC18641F for ; Wed, 27 Jun 2018 19:21:55 +0000 (UTC) Received: from localhost.localdomain ([178.7.121.26]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M5HZD-1gMwt633Wh-00zY8Z for ; Wed, 27 Jun 2018 21:21:51 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Wed, 27 Jun 2018 21:21:50 +0200 Message-Id: <20180627192150.7351-1-ps.report@gmx.net> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:nEtzKVNFN4cXugknaln/gdOiS8WJ9IFy7p4qZHXr7NXmCkij/kh zJZA1wEPd5vuk9pfjeGXa4ET/FGpGZ2Z1mdTt80PuKj0zIOIcNUrBjOY2DmKiZ6bas8qzLF IcszXPwJq8PeIFY/SVcf3754DUUeAbzinYaX2J5sWI1em4zeli9XSS4JSHZvmZd7ZtmFSbZ C/Oy7rOcV4m247Vtqa88g== X-UI-Out-Filterresults: notjunk:1; V01:K0:j59s/dGm8aY=:G87Y5/ljdoo1o/6/vFogJh wSm4/eooOqm87ZPN2Qbuec6wfps0+b7jsc6wbH8JTTX9mIJ8zMhqejfbJlnVMqwrIzB7KR1Q0 4zZ15ASrzYHJ8BsmWYwHanckMOBHtB3tebJdKVGKbbuIiBSBh6QRU/0wdtLGia9qlB67Qm03y sRUkkVqRkIqSN9GKprHtK4T5kwp4sauVf9kvW8S3IDrYrz0RI2g5MeBwnZ4YqGzBstYXKdyn9 /JOxJslZxYNW+D+h3RL5Fl8fcWpMCZeYT9Zr4+OqXyxlfyI22Os06EznwouFevb39RxEvIPBj BVgBRsQqUOGF2GQ8z1VwYPJ/TTrJFXdx25Fo0FOkIN9NJLfTCv+imgkq3aaX/yS6y4C304f6/ RaHODN8Mj3Y46Y9sqnnYSM8ojGlLXwlUZd9T7tw5Jz9P6eL423ehpmaqRFCuGLUREzSCgPF9B yZUjyVKpQpdni8aTIsHWh8lFINJz/p8GcfA92+PaBVUxNEbelUN7w3TV22KMnWvbCSDQZNxg+ fDVGN72w5xPY/2xyDsyEo1vqGmH8P7Q0uBZQf2tlQ9CKk0WmEhiZeCPwFTg1WV72Cj/BjFwZG oX7NwB5aMiuSjMSmSgE6XPHwx+ls06inNZKvMulN1x4CDLqgBmEp0Nwb8eZLT5DSXykmXihVM 9sHow28Ao6Bg4l+V5mHBALMTzQCIOxJREMLkn+vVC6W9c0+XpzDTseXouTuBEmDw/bmoCS6n3 6m78rnb2YdppiIHsEUpi26RzFmpuZRcH2rq1yX+51mnY/UmMJsDRG/YO4jo= Subject: [Buildroot] [PATCH v1] wiringpi: disable for static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Static build of the wiringPi package is disabled by the tool author (see wiringPi/noMoreStatic for details) since the version bump to 2.46. Fixes [1]: arm-linux-gcc.br_real: error: ../wiringPi/libwiringPi.a: No such file or directory [1] http://autobuild.buildroot.net/results/a1ca953247475a5f31fe9283ade05c9cba26853b Signed-off-by: Peter Seiderer --- package/wiringpi/Config.in | 5 +++-- package/wiringpi/wiringpi.mk | 28 +++++++--------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/package/wiringpi/Config.in b/package/wiringpi/Config.in index 2062a6208e..e55a67fbe0 100644 --- a/package/wiringpi/Config.in +++ b/package/wiringpi/Config.in @@ -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 and dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk index 497a5d1ebe..0c3774917c 100644 --- a/package/wiringpi/wiringpi.mk +++ b/package/wiringpi/wiringpi.mk @@ -11,34 +11,20 @@ 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