[oe-commits] org.oe.dev icewm 1.2.30 fix build. close #1324

[mickeyl commit]

icewm 1.2.30 fix build. close #1324

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 62edbc247e43a293ba88e700b10009c4af136923
ViewMTN: http://monotone.openembedded.org/revision/info/62edbc247e43a293ba88e700b10009c4af136923
Files:
1
packages/icewm/icewm-1.2.20
packages/icewm/icewm-1.2.20/configure.patch
packages/icewm/icewm-1.2.20/makefile.patch
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm-1.2.30/makefile.patch
packages/icewm/icewm_1.2.30.bb
Diffs:

#
# mt diff -rec7f958d5bb872b764f0a92765c8597fb0093f1f -r62edbc247e43a293ba88e700b10009c4af136923
#
#
#
# delete "packages/icewm/icewm-1.2.20"
# 
# delete "packages/icewm/icewm-1.2.20/configure.patch"
# 
# delete "packages/icewm/icewm-1.2.20/makefile.patch"
# 
# delete "packages/icewm/icewm_1.2.20.bb"
# 
# patch "packages/icewm/icewm-1.2.30/makefile.patch"
#  from [343b885ad076cbadebd0006881f4d3f735b3a4a6]
#    to [29432933f65f26e92c84768f7ccc82de5dc511dd]
# 
# patch "packages/icewm/icewm_1.2.30.bb"
#  from [1afb403a34441aa9e4586f80e8bd2a29028cf9a4]
#    to [abd74fbb9ac47c0b4b9a5435273eb52eb6cf99c9]
#
============================================================
--- packages/icewm/icewm-1.2.30/makefile.patch	343b885ad076cbadebd0006881f4d3f735b3a4a6
+++ packages/icewm/icewm-1.2.30/makefile.patch	29432933f65f26e92c84768f7ccc82de5dc511dd
@@ -1,26 +1,23 @@
 --- ./src/Makefile.in	2005-02-01 21:56:08.000000000 +0100
 +++ ./src/Makefile.in	2005-02-01 21:55:12.000000000 +0100
-@@ -206,10 +206,21 @@
+@@ -206,10 +206,18 @@
  %.o: %.cc
  	@echo "  CXX   " $@
  	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
 -	
 -genpref $(BINARIES):
 +
-+HOSTCXX=g++
-+HOSTLD=g++
-+
 +genpref.o: genpref.cc
-+	@echo "  HOSTCXX   " $@
-+	@$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
++	@echo "  BUILD_CXX   " $@
++	@$(BUILD_CXX) $(BUILD_CXXFLAGS) $(DEBUG) $(DEFS) $(GCCDEP) -c $<
 +
 +$(BINARIES):
  	@echo "  LD    " $@
  	@$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
 +	
 +genpref:
-+	@echo "  HOSTLD    " $@
-+	@$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
++	@echo "  BUILD_CXX    " $@
++	@$(BUILD_CXX) $(BUILD_LDFLAGS) -o $@$(EXEEXT) $($@_OBJS) $(LIBS) $($@_LIBS)
  
  ################################################################################
  
============================================================
--- packages/icewm/icewm_1.2.30.bb	1afb403a34441aa9e4586f80e8bd2a29028cf9a4
+++ packages/icewm/icewm_1.2.30.bb	abd74fbb9ac47c0b4b9a5435273eb52eb6cf99c9
@@ -1,13 +1,15 @@
+DESCRIPTION = "IceWM Window Manager"
 SECTION = "x11/wm"
-DESCRIPTION = "IceWM Window Manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
 RRECOMMENDS = "ttf-dejavu-sans"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
-	   file://makefile.patch;patch=1 \
-	   file://configure.patch;patch=1"
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
+  file://makefile.patch;patch=1 \
+  file://configure.patch;patch=1 \
+"
 
 inherit autotools pkgconfig