From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:20:09 +0200
Subject: Revert "fix conflict, autoseect libgcj"

This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
---
 package/orbit2/patches/patch-ORBit-2_0_pc_in       | 11 -----
 package/orbit2/patches/patch-configure             | 11 -----
 .../patches/patch-src_idl-compiler_Makefile_in     | 54 ----------------------
 3 files changed, 76 deletions(-)
 delete mode 100644 package/orbit2/patches/patch-ORBit-2_0_pc_in
 delete mode 100644 package/orbit2/patches/patch-configure
 delete mode 100644 package/orbit2/patches/patch-src_idl-compiler_Makefile_in

(limited to 'package/orbit2/patches')

diff --git a/package/orbit2/patches/patch-ORBit-2_0_pc_in b/package/orbit2/patches/patch-ORBit-2_0_pc_in
deleted file mode 100644
index 394e62a0c..000000000
--- a/package/orbit2/patches/patch-ORBit-2_0_pc_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ORBit2-2.14.19.orig/ORBit-2.0.pc.in	2010-02-09 13:05:35.000000000 +0100
-+++ ORBit2-2.14.19/ORBit-2.0.pc.in	2011-03-25 21:11:02.000000000 +0100
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--orbit_idl=@bindir@/orbit-idl-2@EXEEXT@
-+orbit_idl=${prefix}/../@bindir@/orbit-idl-2@EXEEXT@
- 
- 
- Name: ORBit-2.0
diff --git a/package/orbit2/patches/patch-configure b/package/orbit2/patches/patch-configure
deleted file mode 100644
index e2a4d02c9..000000000
--- a/package/orbit2/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ORBit2-2.14.19.orig/configure	2010-09-28 11:39:37.000000000 +0200
-+++ ORBit2-2.14.19/configure	2011-03-25 19:39:53.000000000 +0100
-@@ -8373,7 +8373,7 @@ $as_echo_n "checking whether the $compil
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    #export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-       whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
deleted file mode 100644
index 2053d9f29..000000000
--- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
+++ /dev/null
@@ -1,54 +0,0 @@
---- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in	2010-09-28 11:39:39.000000000 +0200
-+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in	2011-03-25 20:28:46.000000000 +0100
-@@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+	--mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-+CCLD = $(CC_FOR_BUILD)
-+LINK = $(CCLD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- SOURCES = $(orbit_idl_2_SOURCES)
- DIST_SOURCES = $(orbit_idl_2_SOURCES)
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -178,8 +176,8 @@ ORBIT_ALIGNOF_CORBA_SHORT = @ORBIT_ALIGN
- ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@
- ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@
- ORBIT_CFLAGS = @ORBIT_CFLAGS@
--ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@
--ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@
-+ORBIT_IDL_CFLAGS = 
-+ORBIT_IDL_LIBS = 
- ORBIT_LIBS = @ORBIT_LIBS@
- ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@
- ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@
-@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR)
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- RANLIB = @RANLIB@
- SED = @SED@
-@@ -270,8 +268,7 @@ INCLUDES = \
- 	-DVERSION=\"$(ORBIT_VERSION)\"				\
- 	-DORBIT2_INTERNAL_API					\
- 	$(WARN_CFLAGS)						\
--	$(DISABLE_DEPRECATED_CFLAGS)				\
--	$(ORBIT_IDL_CFLAGS)
-+	$(DISABLE_DEPRECATED_CFLAGS)
- 
- orbit_idl_2_LDADD = \
- 	$(ORBIT_IDL_LIBS)		\
-- 
cgit v1.2.3