From patchwork Tue Jun 16 00:12:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1309882 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=c21aTog7; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49m7vD1sn3z9s1x for ; Tue, 16 Jun 2020 10:12:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 04C1287E92; Tue, 16 Jun 2020 00:12:50 +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 hRfZEkPfMrcG; Tue, 16 Jun 2020 00:12:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5DE0E87E76; Tue, 16 Jun 2020 00:12:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8EDA41BF358 for ; Tue, 16 Jun 2020 00:12:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 64F7325656 for ; Tue, 16 Jun 2020 00:12:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tG4QMQMGhByx for ; Tue, 16 Jun 2020 00:12:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by silver.osuosl.org (Postfix) with ESMTPS id 66CB82548F for ; Tue, 16 Jun 2020 00:12:47 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id d12so5853871qvn.0 for ; Mon, 15 Jun 2020 17:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qcqC1kNKXZgWu+fdeNHpF7vrUrQk2NwBZjGxsNlfuX8=; b=c21aTog7UQx3D/DBapBvNn3eVbb+uLFi/r63QCM4bVh9WSG5WL2vTgaE5sK1L0CJVO ygGTrlf9XMHb9QcTenE/IGB0w56EYwD3tjQfgnAwEjAq8TI8odCLBtVazf7c1fLebr3s YLN+df/dFichCTe3MumBE7KNAXK+BQ5b3SsvymjRZlBTj55fPCxdPXChWoH0gwKFtE0I 6zk1GbFJQhynhW8hl1x8uG7URi4QWrAgUUNOEz91+hBvVy1wSLivdXablfoGoEHDfu39 9N4dJLi1edwS6ksYs8lGFvZyo+x63KgHwBn54G2jCH4SU4o3WecMNPU0a7u6vjkw+zvw gwkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qcqC1kNKXZgWu+fdeNHpF7vrUrQk2NwBZjGxsNlfuX8=; b=IGwJ5qVpwq2eJpzz7TzKzAsoYMGM+PkoQufque6OGAVQOVW21WztfAOZoU5CnwQhI2 /p4Fid+ZcoggC6P/NoPBL7KLDI5a2sF4k5LzrPlTt3wJYxfaocusTxpX8h0H0g5//SUD Yukm6wtS/ckbJ9O6CFPMLUJRT4m1FpgoKRwA0SaXNGENQze8NwDbgBrn6yL9PlV7ELkT E88yz36FgcbctPHaACw2R+FqOcsnLV4FbXZB+LYT5KKPDspEmnDi1jSMm+HuQkfOCEbk UxyAa+eK4MhY6pkUB8loanTxBeL02PVik/c5B9Tgx4RFFOW5zwPGz2zJE1wfSfaG2eOg b2Vw== X-Gm-Message-State: AOAM533Lp1dVHzyvcYLoJH84mAgJZ2eNASL2F6/d7Btc1oU+1MiLHofv AAp+lEjI4uz6r1zrkXBtqZksWd8D X-Google-Smtp-Source: ABdhPJxu0YyBsymilGx8mUBmiPQBL7UG11Y9arG9+uwOtjnM7D2lFtm+Boah6TvqZtB8VAYYyvehSw== X-Received: by 2002:a05:6214:11b3:: with SMTP id u19mr289370qvv.99.1592266366208; Mon, 15 Jun 2020 17:12:46 -0700 (PDT) Received: from aduskett-workstation.rai.com ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id c34sm14541539qte.41.2020.06.15.17.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 17:12:45 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 17:12:43 -0700 Message-Id: <20200616001243.3285921-1-aduskett@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/openjdk: install header files to staging X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tudor Holton , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett These files are necessary for C or C++ programs to use the native java interface (JNI.) Signed-off-by: Adam Duskett --- package/openjdk/openjdk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index f3a4a616eb..22c9a777b5 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -20,6 +20,7 @@ endif OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE +OPENJDK_INSTALL_STAGING = YES # OpenJDK requires Alsa, cups, and X11 even for a headless build. # host-zip is needed for the zip executable. @@ -145,6 +146,12 @@ define OPENJDK_INSTALL_TARGET_CMDS cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/bin/* . endef +define OPENJDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/jvm + cp -dpfr $(@D)/build/linux-*-release/jdk/include/* \ + $(STAGING_DIR)/usr/include/jvm +endef + # Demos and includes are not needed on the target ifeq ($(BR2_PACKAGE_OPENJDK_FULL_JDK),y) define OPENJDK_REMOVE_UNEEDED_JDK_DIRECTORIES