Commits

Anonymous committed 8ec8ea5

Fix make build for cc link removal

Comments (0)

Files changed (8)

components/bcc/Makefile

 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
 # Create the Makefile before we build
-COMPONENT_PRE_BUILD_ACTION = (cd $(@D) ; $(GMAKE) make.fil)
+COMPONENT_PRE_BUILD_ACTION = (cd $(@D) ; $(ENV) CC="$(CC)" $(GMAKE) make.fil)
 # build with the created Makefile (make.fil)
 COMPONENT_BUILD_ARGS = -f make.fil
 COMPONENT_BUILD_ARGS += PATH="$(@D)/bin:$(PATH)"

components/imagemagick/Makefile

 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
 # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but in
 # this case we need to replace the '-' by '.'.
 #

components/irssi/Makefile

 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
 CONFIGURE_OPTIONS +=	--with-perl=yes
 CONFIGURE_OPTIONS +=	--with-proxy
 CONFIGURE_OPTIONS +=	--with-perl-lib=$(CONFIGURE_PREFIX)/perl5/vendor_perl/$(PERL_VERSION)

components/nethack/Makefile

 #
 COMPONENT_PREP_ACTION= (cd $(SOURCE_DIR)/sys/unix ; sh setup.sh)
 
+COMPONENT_BUILD_ENV += CC="$(SPRO_VROOT)/bin/cc"
+
 COMPONENT_INSTALL_ARGS += CHOWN=true
 COMPONENT_INSTALL_ARGS += CHGRP=true
 COMPONENT_INSTALL_ARGS += ROOT=$(PROTO_DIR)

components/unzip/Makefile

 # remove the unwanted file.
 COMPONENT_PREP_ACTION = $(RM) $(SOURCE_DIR)/crc_i386.S
 
+COMPONENT_BUILD_ENV += CC="$(SPRO_VROOT)/bin/cc"
 COMPONENT_BUILD_ENV += \
  "LOCAL_UNZIP=-DUNICODE_SUPPORT -DNO_WORKING_ISPRINT -DUNICODE_WCHAR"
 

components/unzip/patches/Makefile.patch

+--- unzip60/unix/Makefile.orig	2012-10-09 09:46:34.677216260 +0100
++++ unzip60/unix/Makefile	2012-10-09 09:47:45.105471640 +0100
+@@ -42,7 +42,6 @@
+ # such as -DDOSWILD).
+ 
+ # UnZip flags
+-CC = cc#	try using "gcc" target rather than changing this (CC and LD
+ LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
+ AS = as
+ LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)

components/zip/Makefile

 # remove the unwanted file.
 COMPONENT_PREP_ACTION = rm -f $(SOURCE_DIR)/match.S
 
+COMPONENT_BUILD_ENV += CC="$(SPRO_VROOT)/bin/cc"
+
 # The Makefile we want is under unix/Makefile
 COMPONENT_BUILD_ARGS += -f unix/Makefile
 COMPONENT_BUILD_TARGETS += generic

components/zip/patches/Makefile.patch

+--- zip30/unix/Makefile.orig	2012-10-09 10:21:17.540115675 +0100
++++ zip30/unix/Makefile	2012-10-09 10:21:30.652868285 +0100
+@@ -22,7 +22,6 @@
+ LN = ln -s
+ 
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp