Ver código fonte

libecore: tweak makekeys workaround for make 3.82

It seems that make 3.82 gets confused and considers makekeys
out of date when there isn't a makekeys.o, so ensure that we
create both makekeys and makekeys.o before building.

Also move the workaround to the extract step so we can build using
make's default rules rather than explicitly calling gcc.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 13 anos atrás
pai
commit
d6628bca39
1 arquivos alterados com 2 adições e 3 exclusões
  1. 2 3
      package/efl/libecore/libecore.mk

+ 2 - 3
package/efl/libecore/libecore.mk

@@ -76,11 +76,10 @@ LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util
 # teach it about CC_FOR_BUILD, but for now simply build makekeys by
 # teach it about CC_FOR_BUILD, but for now simply build makekeys by
 # hand in advance
 # hand in advance
 define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
 define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
-	cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
-		-o makekeys makekeys.c
+	$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
 endef
 endef
 
 
-LIBECORE_POST_CONFIGURE_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
+LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
 else
 else
 LIBECORE_CONF_OPT += --disable-ecore-x-xcb
 LIBECORE_CONF_OPT += --disable-ecore-x-xcb
 endif
 endif