| Message ID | 20200616001243.3285921-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/openjdk: install header files to staging | expand |
On Mon, 15 Jun 2020 17:12:43 -0700 aduskett@gmail.com wrote: > From: Adam Duskett <Aduskett@gmail.com> > > These files are necessary for C or C++ programs to use the native java > interface (JNI.) > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > --- > package/openjdk/openjdk.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas
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