[Eros-commits] r357 - in tags/diamondback/packages: rosdeps/…

Top Page
This message is part of the following thread:
Mthe complete thread tree sorted by date
 
 
Attachments:
Message as email
+ (text/plain)
Delete this message
Reply to this message
Author: snorri@code.ros.org
Date:  
To: eros-commits
Subject: [Eros-commits] r357 - in tags/diamondback/packages: rosdeps/core/eros_apr rosdeps/core/eros_log4cxx toolchains/mingw_cross toolchains/mingw_cross/patches
Author: snorri
Date: 2011-08-11 01:26:44 -0700 (Thu, 11 Aug 2011)
New Revision: 357

Added:
tags/diamondback/packages/toolchains/mingw_cross/patches/libpng.mk
Modified:
tags/diamondback/packages/rosdeps/core/eros_apr/CMakeLists.txt
tags/diamondback/packages/rosdeps/core/eros_log4cxx/CMakeLists.txt
tags/diamondback/packages/toolchains/mingw_cross/Makefile
tags/diamondback/packages/toolchains/mingw_cross/patches/apr-util.mk
tags/diamondback/packages/toolchains/mingw_cross/patches/apr.mk
tags/diamondback/packages/toolchains/mingw_cross/patches/log4cxx.mk
Log:
mingw_cross : new version, also new gcc fixes the -no-undefined bug. 

Modified: tags/diamondback/packages/rosdeps/core/eros_apr/CMakeLists.txt
===================================================================
--- tags/diamondback/packages/rosdeps/core/eros_apr/CMakeLists.txt    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/rosdeps/core/eros_apr/CMakeLists.txt    2011-08-11 08:26:44 UTC (rev 357)
@@ -31,16 +31,6 @@
 if(MINGW)
   # Fix a bug in mingw cross compiler not setting this macro for you.
   set(ROS_COMPILE_FLAGS "${ROS_COMPILE_FLAGS} -D_WIN32_WINNT=0x0500")
-  # Can't find any documentation on this option (--no-undefined is there, but this aint!)
-  # Anyway, it bombs when gcc tries to use it, but seems to help libtool at the final
-  # linking stage. If its not there, then mingw aborts with unfound symbol errors.
-  # That too is a problem, and maybe should be resolved better than just by saying
-  # -no-undefined.
-  if(ROS_LINK_FLAGS)
-    set(ROS_LINK_FLAGS "-no-undefined ${ROS_LINK_FLAGS}")
-  else()
-    set(ROS_LINK_FLAGS "-no-undefined")
-  endif()
 endif()


set(COMMON_ARGS --prefix=${CMAKE_INSTALL_PREFIX} 

Modified: tags/diamondback/packages/rosdeps/core/eros_log4cxx/CMakeLists.txt
===================================================================
--- tags/diamondback/packages/rosdeps/core/eros_log4cxx/CMakeLists.txt    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/rosdeps/core/eros_log4cxx/CMakeLists.txt    2011-08-11 08:26:44 UTC (rev 357)
@@ -26,16 +26,6 @@
 if(MINGW)                    
   # Fix a bug in mingw cross compiler not setting this macro for you.
   set(ROS_COMPILE_FLAGS "${ROS_COMPILE_FLAGS} -D_WIN32_WINNT=0x0500")
-  # Can't find any documentation on this option (--no-undefined is there, but this aint!)
-  # Anyway, it bombs when gcc tries to use it, but seems to help libtool at the final
-  # linking stage. If its not there, then mingw aborts with unfound symbol errors.
-  # That too is a problem, and maybe should be resolved better than just by saying
-  # -no-undefined.
-  if(ROS_LINK_FLAGS)
-    #set(ROS_LINK_FLAGS "-no-undefined ${ROS_LINK_FLAGS}")
-  else()
-    #set(ROS_LINK_FLAGS "-no-undefined")
-  endif()
 endif()


if(ROS_BUILD_STATIC_LIBS) 

Modified: tags/diamondback/packages/toolchains/mingw_cross/Makefile
===================================================================
--- tags/diamondback/packages/toolchains/mingw_cross/Makefile    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/toolchains/mingw_cross/Makefile    2011-08-11 08:26:44 UTC (rev 357)
@@ -2,7 +2,7 @@


PREFIX=/opt/mingw
TUPLE=i686-pc-mingw32
-NAME=mingw-cross-env-2.20
+NAME=mingw-cross-env-2.21
TARBALL=${NAME}.tar.gz
URL=https://bitbucket.org/vog/mingw-cross-env/downloads/$(TARBALL)

@@ -48,7 +48,7 @@ 


 compile: extract
-    @echo "Compiling the mingw gcc toolchain."
+    @echo "Compiling mingw gcc, log4cxx, boost and qt."
     @if [ ! -f $(PREFIX)/usr/installed/gcc ]; then \
         cd $(PREFIX); make gcc log4cxx boost qt; \
         echo; \


Modified: tags/diamondback/packages/toolchains/mingw_cross/patches/apr-util.mk
===================================================================
--- tags/diamondback/packages/toolchains/mingw_cross/patches/apr-util.mk    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/toolchains/mingw_cross/patches/apr-util.mk    2011-08-11 08:26:44 UTC (rev 357)
@@ -1,20 +1,6 @@
 # This file is part of mingw-cross-env.
 # See doc/index.html for further information.


-# Special flags
-#
-# -no-undefined
-#
-# Can't find any documentation on this option 
-# (--no-undefined is there, but this aint!)
-# Anyway, it bombs when gcc tries to use it, 
-# but seems to help libtool at the final
-# linking stage. If its not there, then 
-# mingw aborts with unfound symbol errors.
-# That too is a problem, and maybe should 
-# resolved better than just by saying
-# -no-undefined.
-
 PKG             := apr-util
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.3.10
@@ -44,7 +30,6 @@
         --without-sqlite2 \
         --without-sqlite3 \
         --with-apr='$(PREFIX)/$(TARGET)' \
-        CFLAGS=-D_WIN32_WINNT=0x0500 \
-        LDFLAGS=-no-undefined
+        CFLAGS=-D_WIN32_WINNT=0x0500 
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 endef


Modified: tags/diamondback/packages/toolchains/mingw_cross/patches/apr.mk
===================================================================
--- tags/diamondback/packages/toolchains/mingw_cross/patches/apr.mk    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/toolchains/mingw_cross/patches/apr.mk    2011-08-11 08:26:44 UTC (rev 357)
@@ -1,20 +1,7 @@
 # This file is part of mingw-cross-env.
 # See doc/index.html for further information.


-# Special flags
-#
-# -no-undefined
-#
-# Can't find any documentation on this option 
-# (--no-undefined is there, but this aint!)
-# Anyway, it bombs when gcc tries to use it, 
-# but seems to help libtool at the final
-# linking stage. If its not there, then 
-# mingw aborts with unfound symbol errors.
-# That too is a problem, and maybe should 
-# resolved better than just by saying
-# -no-undefined.
-#
+
 # Type sizes
 #
 # Sometimes wine has an emulation environment which runs conf tests,
@@ -54,7 +41,6 @@
         ac_cv_sizeof_pid_t=4 \
         ac_cv_sizeof_size_t=4 \
         ac_cv_sizeof_ssize_t=4 \
-        CFLAGS=-D_WIN32_WINNT=0x0500 \
-        LDFLAGS=-no-undefined
+        CFLAGS=-D_WIN32_WINNT=0x0500 
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 endef


Added: tags/diamondback/packages/toolchains/mingw_cross/patches/libpng.mk
===================================================================
--- tags/diamondback/packages/toolchains/mingw_cross/patches/libpng.mk                            (rev 0)
+++ tags/diamondback/packages/toolchains/mingw_cross/patches/libpng.mk    2011-08-11 08:26:44 UTC (rev 357)
@@ -0,0 +1,38 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# libpng
+PKG             := libpng
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.5.4
+$(PKG)_CHECKSUM := acf6626a7ea6ff89e30c9c9eeffe992ee1605447
+$(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
+$(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
+$(PKG)_WEBSITE  := http://www.libpng.org/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.simplesystems.org/pub/$(PKG)/png/src/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc zlib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=tags' | \
+    grep '<a class="list name"' | \
+    $(SED) -n 's,.*<a[^>]*>v\([0-9][^<]*\)<.*,\1,p' | \
+    grep -v alpha | \
+    grep -v beta | \
+    grep -v rc | \
+    grep -v '^1\.4\.' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -std=c99 -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \
+        `'$(PREFIX)/$(TARGET)/bin/libpng-config' --static --cflags --libs`
+endef


Modified: tags/diamondback/packages/toolchains/mingw_cross/patches/log4cxx.mk
===================================================================
--- tags/diamondback/packages/toolchains/mingw_cross/patches/log4cxx.mk    2011-07-25 02:16:00 UTC (rev 356)
+++ tags/diamondback/packages/toolchains/mingw_cross/patches/log4cxx.mk    2011-08-11 08:26:44 UTC (rev 357)
@@ -1,20 +1,6 @@
 # This file is part of mingw-cross-env.
 # See doc/index.html for further information.


-# Special flags
-#
-# -no-undefined
-#
-# Can't find any documentation on this option 
-# (--no-undefined is there, but this aint!)
-# Anyway, it bombs when gcc tries to use it, 
-# but seems to help libtool at the final
-# linking stage. If its not there, then 
-# mingw aborts with unfound symbol errors.
-# That too is a problem, and maybe should 
-# resolved better than just by saying
-# -no-undefined.
-
 PKG             := log4cxx
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.10.0


_______________________________________________
Eros-commits mailing list

https://code.ros.org/mailman/listinfo/eros-commits

This message was posted to the following mailing lists:
eros-commits
Mailing List Info | Nearby Messages		<-[Eros-commits] r356 - in tags/diamondback/tests: . hello_qt hello_qt/include hello_qt/include/hello_qt hello_qt/resources hello_qt/resources/images hello_qt/src hello_qt/ui hello_world[Eros-commits] r358 - trunk/packages/toolchains/mingw_cross/patches->
code.ros.org list archives administrated by ros.orgLurker (version 2.3)