Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
7095a0d1e9

+ 0 - 56
package/orbit2/Makefile

@@ -1,56 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		ORBit2
-PKG_VERSION:=		2.14.19
-PKG_EXTRAVER:=		2.14
-PKG_RELEASE:=		5
-PKG_HASH:=		5724ed85c626ce406156d2f7c4d104d670eb82cf78e582c325e713a31632c9bd
-PKG_DESCR:=		corba 2.4-compliant object request broker
-PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		glib libIDL-host libIDL 
-HOST_BULDDEP:=		glib-host libIDL-host
-PKG_NEEDS:=		intl
-PKG_URL:=		http://projects.gnome.org/ORBit2/
-PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
-PKG_LIBNAME:=		orbit2
-PKG_OPTS:=		dev
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-HOST_CFLAGS+=		$(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags 2>/dev/null)
-HOST_LIBS:=		$(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --libs 2>/dev/null)
-HOST_LDFLAGS+=		-static
-HOST_LIBS+=		-lrt
-HOST_LIBS+=		-lgmodule-2.0 -ldl -lpthread -lglib-2.0
-CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
-			ac_cv_alignof_CORBA_boolean=1 \
-			ac_cv_alignof_CORBA_char=1 \
-			ac_cv_alignof_CORBA_wchar=2 \
-			ac_cv_alignof_CORBA_short=2 \
-			ac_cv_alignof_CORBA_long=4 \
-			ac_cv_alignof_CORBA_long_long=4 \
-			ac_cv_alignof_CORBA_float=4 \
-			ac_cv_alignof_CORBA_double=4 \
-			ac_cv_alignof_CORBA_long_double=4 \
-			ac_cv_alignof_CORBA_struct=1 \
-			ac_cv_alignof_CORBA_pointer=4 \
-			ac_cv_cflags_gcc_option__Werror_implicit_function_declaration=no
-
-orbit2-install:
-	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
-		$(IDIR_ORBIT2)/usr/lib
-	$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
-		$(STAGING_TARGET_DIR)/usr/bin
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 0 - 11
package/orbit2/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- ORBit2-2.14.19.orig/Makefile.in	2010-09-28 11:39:41.000000000 +0200
-+++ ORBit2-2.14.19/Makefile.in	2013-10-10 10:22:00.000000000 +0200
-@@ -296,7 +296,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--SUBDIRS = linc2 src include test docs
-+SUBDIRS = linc2 src include docs
- bin_SCRIPTS = orbit2-config
- EXTRA_DIST = \
- 	ORBit2.m4	\

+ 0 - 11
package/orbit2/patches/patch-ORBit-2_0_pc_in

@@ -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

+ 0 - 20
package/orbit2/patches/patch-configure

@@ -1,20 +0,0 @@
---- ORBit2-2.14.19.orig/configure	2010-09-28 11:39:37.000000000 +0200
-+++ ORBit2-2.14.19/configure	2013-12-08 19:30:23.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'
-@@ -12950,7 +12950,7 @@ $as_echo "$WARN_CFLAGS" >&6; }
- 
- if test "$enable_maintainer_mode" = "yes"; then
- 	DISABLE_DEPRECATED_CFLAGS=" \
--		-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
-+		-DG_DISABLE_SINGLE_INCLUDES"
- 
- fi
- 

+ 0 - 29
package/orbit2/patches/patch-linc2_src_Makefile_in

@@ -1,29 +0,0 @@
---- ORBit2-2.14.19.orig/linc2/src/Makefile.in	2010-09-28 11:39:39.000000000 +0200
-+++ ORBit2-2.14.19/linc2/src/Makefile.in	2013-12-08 19:32:44.000000000 +0100
-@@ -54,7 +54,7 @@ am_liblinc_la_OBJECTS = linc.lo linc-con
- liblinc_la_OBJECTS = $(am_liblinc_la_OBJECTS)
- liblinc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(liblinc_la_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LDFLAGS) $(liblinc_la_LDFLAGS) -o $@
- am__installdirs = "$(DESTDIR)$(bindir)"
- PROGRAMS = $(bin_PROGRAMS)
- am_linc_cleanup_sockets_OBJECTS = cleanup.$(OBJEXT)
-@@ -62,7 +62,7 @@ linc_cleanup_sockets_OBJECTS = $(am_linc
- linc_cleanup_sockets_LDADD = $(LDADD)
- linc_cleanup_sockets_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(linc_cleanup_sockets_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LDFLAGS) $(linc_cleanup_sockets_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la
- #	-I$(top_srcdir)/include    
- INCLUDES = -I$(top_builddir)/linc2/include \
- 	-I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
--	-DG_DISABLE_DEPRECATED $(am__append_1)
-+	$(am__append_1)
- liblinc_la_SOURCES = \
- 	linc.c			\
- 	linc-connection.c	\

+ 0 - 54
package/orbit2/patches/patch-src_idl-compiler_Makefile_in

@@ -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	2014-03-15 20:45:12.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@
-@@ -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)		\
-@@ -383,7 +380,7 @@ clean-binPROGRAMS:
- 	rm -f $$list
- orbit-idl-2$(EXEEXT): $(orbit_idl_2_OBJECTS) $(orbit_idl_2_DEPENDENCIES) 
- 	@rm -f orbit-idl-2$(EXEEXT)
--	$(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS)
-+	$(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) $(LIBS_FOR_BUILD)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)

+ 0 - 17
package/orbit2/patches/patch-src_services_name_Makefile_in

@@ -1,17 +0,0 @@
---- ORBit2-2.14.19.orig/src/services/name/Makefile.in	2010-09-28 11:39:40.000000000 +0200
-+++ ORBit2-2.14.19/src/services/name/Makefile.in	2011-05-17 11:56:37.536610398 +0200
-@@ -100,12 +100,12 @@ am__DEPENDENCIES_2 = $(top_builddir)/src
- 	$(am__DEPENDENCIES_1)
- name_client_2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(name_client_2_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LDFLAGS) $(name_client_2_LDFLAGS) -o $@
- am_orbit_name_server_2_OBJECTS = boot.$(OBJEXT)
- orbit_name_server_2_OBJECTS = $(am_orbit_name_server_2_OBJECTS)
- orbit_name_server_2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(orbit_name_server_2_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LDFLAGS) $(orbit_name_server_2_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles