SF.net SVN: gar:[22679] csw/mgar/pkg/libemf/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Dec 12 18:09:56 CET 2013


Revision: 22679
          http://sourceforge.net/p/gar/code/22679
Author:   dmichelsen
Date:     2013-12-12 17:09:54 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
libemf/trunk: Rework and cleanup

Modified Paths:
--------------
    csw/mgar/pkg/libemf/trunk/Makefile
    csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch

Removed Paths:
-------------
    csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch
    csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch

Modified: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile	2013-12-12 17:09:37 UTC (rev 22678)
+++ csw/mgar/pkg/libemf/trunk/Makefile	2013-12-12 17:09:54 UTC (rev 22679)
@@ -14,10 +14,6 @@
 PATCHFILES += 0001-Use-__sparc-and-__i386-for-Solaris.patch
 PATCHFILES += 0003-Keep-norunpath-during-libtool.patch
 
-#PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch
-#PATCHFILES += 0003-Always-use-csw-libtool.patch
-#PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch
-
 PACKAGES += CSWlibemf
 SPKG_DESC_CSWlibemf = $(DESCRIPTION)
 # PKGFILES is catchall
@@ -26,6 +22,8 @@
 PACKAGES += CSWlibemf1
 SPKG_DESC_CSWlibemf1 = Runtime library libEMF.so.1
 PKGFILES_CSWlibemf1 += $(call pkgfiles_lib,libEMF.so.1)
+# This is true for sparc as the library does not work for sparc64
+CHECKPKG_OVERRIDES_CSWlibemf1 += 64-bit-binaries-missing
 
 PACKAGES += CSWlibemf-dev
 SPKG_DESC_CSWlibemf-dev = Development files for libEMF.so.1
@@ -40,10 +38,11 @@
 
 EXTRA_LINKER_FLAGS += -norunpath
 
+BUILD64_LIBS_ONLY = 1
+
 # 64 bit on Sparc is problematic as documented in include/libEMF/wine/winnt.h:
 #    * This structure is valid only for 32-bit SPARC architectures, not for 64-bit SPARC.
-SKIPTEST ?= 1
-BUILD64_LIBS_ONLY = 1
+SKIP_MODULATIONS += isa-$(ISA_DEFAULT64_sparc)
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch	2013-12-12 17:09:37 UTC (rev 22678)
+++ csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch	2013-12-12 17:09:54 UTC (rev 22679)
@@ -1,14 +1,14 @@
-From 023a228660a6cdb955db4d4a5b3da3b5edfcde30 Mon Sep 17 00:00:00 2001
+From 3d08d8589aa7974d0eea96f59e6b5c5faf2354ea Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 1 Jan 2013 19:18:22 +0100
+Date: Thu, 12 Dec 2013 15:48:49 +0100
 Subject: [PATCH] Use __sparc and __i386 for Solaris
 
 ---
- include/libEMF/wine/winnt.h | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
+ include/libEMF/wine/winnt.h | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
-index f76c08a..3a8d6f2 100644
+index f76c08a..ad66499 100644
 --- a/include/libEMF/wine/winnt.h
 +++ b/include/libEMF/wine/winnt.h
 @@ -29,7 +29,11 @@
@@ -24,9 +24,20 @@
  # undef  WORDS_BIGENDIAN
  # undef  BITFIELDS_BIGENDIAN
  # define ALLOW_UNALIGNED_ACCESS
-@@ -45,6 +49,10 @@
+@@ -37,6 +41,10 @@
  # undef  WORDS_BIGENDIAN
  # undef  BITFIELDS_BIGENDIAN
+ # define ALLOW_UNALIGNED_ACCESS
++#elif defined(__amd64)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
+ #elif defined(__alpha__)
+ # undef  WORDS_BIGENDIAN
+ # undef  BITFIELDS_BIGENDIAN
+@@ -45,6 +53,10 @@
+ # undef  WORDS_BIGENDIAN
+ # undef  BITFIELDS_BIGENDIAN
  # undef  ALLOW_UNALIGNED_ACCESS
 +#elif defined(__sparc)
 +# define WORDS_BIGENDIAN
@@ -35,7 +46,7 @@
  #elif defined(__sparc__)
  # define WORDS_BIGENDIAN
  # define BITFIELDS_BIGENDIAN
-@@ -676,7 +684,7 @@ typedef struct _CONTEXT86
+@@ -676,7 +688,7 @@ typedef struct _CONTEXT86
  #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS)
  
  /* i386 context definitions */
@@ -44,7 +55,7 @@
  
  #define CONTEXT_CONTROL         CONTEXT86_CONTROL
  #define CONTEXT_INTEGER         CONTEXT86_INTEGER
-@@ -1225,7 +1233,7 @@ typedef struct _STACK_FRAME_HEADER
+@@ -1225,7 +1237,7 @@ typedef struct _STACK_FRAME_HEADER
  
  #endif  /* __PPC__ */
  
@@ -54,5 +65,5 @@
  /* 
   * FIXME:  
 -- 
-1.8.0
+1.8.4.1
 

Deleted: csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch	2013-12-12 17:09:37 UTC (rev 22678)
+++ csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch	2013-12-12 17:09:54 UTC (rev 22679)
@@ -1,32 +0,0 @@
-From 313b74dc289993a8a41974545df95d2e41f16978 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 22 Nov 2010 15:43:35 +0100
-Subject: [PATCH 2/2] Remove unneeded definition causing link errors
-
----
- include/libEMF/wine/winbase.h |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/include/libEMF/wine/winbase.h b/include/libEMF/wine/winbase.h
-index 366a777..3abb6b1 100644
---- a/include/libEMF/wine/winbase.h
-+++ b/include/libEMF/wine/winbase.h
-@@ -1802,6 +1802,7 @@ LONG        WINAPI InterlockedIncrement(PLONG);
- VOID        WINAPI SetLastError(DWORD);
- #endif  /* __i386__ && __GNUC__ */
- 
-+#if 0
- /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
- static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
- {
-@@ -1812,6 +1813,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
- {
-     return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
- }
-+#endif
- 
- #ifdef __WINE__
- #define GetCurrentProcess() ((HANDLE)0xffffffff)
--- 
-1.7.3
-

Deleted: csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch	2013-12-12 17:09:37 UTC (rev 22678)
+++ csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch	2013-12-12 17:09:54 UTC (rev 22679)
@@ -1,39 +0,0 @@
-From 110d57854830c674d7dbacb65331df0995d0d3ee Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 22 Nov 2010 16:40:39 +0100
-Subject: [PATCH 4/4] Do not use link against libstdc++
-
----
- src/Makefile.in   |    2 +-
- tests/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 2d7c678..7bd2c79 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -186,7 +186,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/include
--LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -lm
-+LDADD = $(top_builddir)/libemf/libEMF.la -lm
- all: all-am
- 
- .SUFFIXES:
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 4e5ecfb..5c8fdb4 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/include
--LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++
-+LDADD = $(top_builddir)/libemf/libEMF.la
- TESTS = docheck1 docheck2 docheck3
- EXTRA_DIST = docheck1 docheck2 docheck3 emfs/check1.emf emfs/check3.emf
- MOSTLYCLEANFILES = check1.emf check2.emf check3.emf
--- 
-1.7.3
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list