| Message ID | 20240704123452.3535612-3-heiko.thiery@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/ccache: bump version | expand |
On 04/07/2024 14:34, Heiko Thiery wrote: > The host support is required for ccmake > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > --- > package/xxhash/xxhash.mk | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk > index 7708ba1e19..97bb2ca722 100644 > --- a/package/xxhash/xxhash.mk > +++ b/package/xxhash/xxhash.mk > @@ -15,6 +15,10 @@ XXHASH_INSTALL_TARGETS = \ > install_libxxhash.includes \ > install_libxxhash.pc \ > install_xxhsum > +HOST_XXHASH_INSTALL_TARGETS = \ > + install_libxxhash \ > + install_libxxhash.includes \ > + install_libxxhash.pc I think we only need these separate install targets because for the target we need to handle shared/static libs. For the host, we don't care, so we can just use 'make install' I think. > > ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > XXHASH_TARGETS += libxxhash.a > @@ -41,4 +45,18 @@ define XXHASH_INSTALL_TARGET_CMDS > PREFIX=/usr DESTDIR=$(TARGET_DIR) $(XXHASH_INSTALL_TARGETS) > endef > > +# we are a ccache dependency, so we can't use ccache > +HOST_XXHASH_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" > +HOST_XXHASH_OPTS += DESTDIR=$(HOST_DIR) PREFIX=/usr For host installation, there should be no DESTDIR and it should be PREFIX=$(HOST_DIR) (without /usr). Regards, Arnout > + > +define HOST_XXHASH_BUILD_CMDS > + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) > +endef > + > +define HOST_XXHASH_INSTALL_CMDS > + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) \ > + $(HOST_XXHASH_INSTALL_TARGETS) > +endef > + > $(eval $(generic-package)) > +$(eval $(host-generic-package))
diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 7708ba1e19..97bb2ca722 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -15,6 +15,10 @@ XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ install_libxxhash.pc \ install_xxhsum +HOST_XXHASH_INSTALL_TARGETS = \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a @@ -41,4 +45,18 @@ define XXHASH_INSTALL_TARGET_CMDS PREFIX=/usr DESTDIR=$(TARGET_DIR) $(XXHASH_INSTALL_TARGETS) endef +# we are a ccache dependency, so we can't use ccache +HOST_XXHASH_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" +HOST_XXHASH_OPTS += DESTDIR=$(HOST_DIR) PREFIX=/usr + +define HOST_XXHASH_BUILD_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) +endef + +define HOST_XXHASH_INSTALL_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) \ + $(HOST_XXHASH_INSTALL_TARGETS) +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
The host support is required for ccmake Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- package/xxhash/xxhash.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)