summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk2
-rw-r--r--package/dbus/Makefile4
-rw-r--r--package/dbus/files/dbus.init4
-rw-r--r--package/dbus/patches/patch-configure22
-rw-r--r--package/dbus/patches/patch-ltmain_sh39
-rw-r--r--package/gconf/Makefile11
-rw-r--r--package/libIDL/Makefile3
-rw-r--r--package/orbit2/Makefile16
-rw-r--r--package/qemu/Makefile8
9 files changed, 38 insertions, 71 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index e7e6571c0..6aad509de 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -200,7 +200,7 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget --timeout=30 $(QUIET)
+FETCH_CMD?= wget --timeout=30 -t 3 $(QUIET)
ifeq ($(ADK_HOST_CYGWIN),y)
EXEEXT:= .exe
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index fb4f05b67..1835e5a56 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
-PKG_VERSION:= 1.2.24
+PKG_VERSION:= 1.4.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c
+PKG_MD5SUM:= 99b165f727dd8a5c4b7e2c20a8bf5db6
PKG_DESCR:= DBUS library
PKG_SECTION:= libs
PKG_DEPENDS:= libexpat
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 4a1bac9e9..0ccdaad2a 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -11,10 +11,10 @@ autostart)
;;
start)
mkdir -p /var/run/dbus
- /usr/sbin/dbus-daemon --config-file=/etc/dbus-1/system.conf
+ /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf
;;
stop)
- kill $(pgrep -f /usr/sbin/dbus-daemon)
+ kill $(pgrep -f /usr/bin/dbus-daemon)
;;
restart)
sh $0 stop
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
deleted file mode 100644
index 18acacbc8..000000000
--- a/package/dbus/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- dbus-1.2.24.orig/configure 2010-03-23 20:11:22.000000000 +0100
-+++ dbus-1.2.24/configure 2011-01-14 19:21:37.000000000 +0100
-@@ -25294,19 +25294,6 @@ if test "x$GCC" = "xyes"; then
- ;;
- esac
-
-- case " $CFLAGS " in
-- *[\ \ ]-fPIE[\ \ ]*) ;;
-- *) if cc_supports_flag -fPIE; then
-- PIE_CFLAGS="-fPIE"
-- if ld_supports_flag -z,relro; then
-- PIE_LDFLAGS="-pie -Wl,-z,relro"
-- else
-- PIE_LDFLAGS="-pie"
-- fi
-- fi
-- ;;
-- esac
--
- ### Disabled warnings, and compiler flag overrides
-
- # Let's just ignore unused for now
diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh
deleted file mode 100644
index c594b88f2..000000000
--- a/package/dbus/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100
-+++ dbus-1.2.24/ltmain.sh 2011-01-14 19:22:39.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
-@@ -5516,27 +5516,6 @@ func_mode_link ()
- esac
- fi
-
-- # Hardcode the library path.
-- # Skip directories that are in the system default run-time
-- # search path.
-- case " $sys_lib_dlsearch_path " in
-- *" $absdir "*) ;;
-- *)
-- case "$compile_rpath " in
-- *" $absdir "*) ;;
-- *) compile_rpath="$compile_rpath $absdir"
-- esac
-- ;;
-- esac
-- case " $sys_lib_dlsearch_path " in
-- *" $libdir "*) ;;
-- *)
-- case "$finalize_rpath " in
-- *" $libdir "*) ;;
-- *) finalize_rpath="$finalize_rpath $libdir"
-- esac
-- ;;
-- esac
- fi # $linkmode,$pass = prog,link...
-
- if test "$alldeplibs" = yes &&
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dd47682c2..016ce5741 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= de83e70453910ac62f9ee2a86444bdab
PKG_DESCR:= a system for storing application preferences
PKG_SECTION:= libs
-PKG_BUILDDEP:= dbus dbus-glib
+PKG_BUILDDEP:= dbus dbus-glib orbit2
PKG_DEPENDS:= dbus dbus-glib
PKG_URL:= http://projects.gnome.org/gconf/
PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
@@ -25,5 +25,14 @@ gconf-install:
$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib
$(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \
$(IDIR_GCONF)/usr/lib
+ $(INSTALL_DIR) $(IDIR_GCONF)/usr/lib/GConf/2
+ $(CP) $(WRKINST)/usr/lib/GConf/2/*.so \
+ $(IDIR_GCONF)/usr/lib/GConf/2
+ $(INSTALL_DIR) $(IDIR_GCONF)/usr/libexec
+ $(INSTALL_BIN) $(WRKINST)/usr/libexec/gconfd-2 \
+ $(IDIR_GCONF)/usr/libexec
+ $(INSTALL_DIR) $(IDIR_GCONF)/usr/share/dbus-1/services
+ $(CP) $(WRKINST)/usr/share/dbus-1/services/* \
+ $(IDIR_GCONF)/usr/share/dbus-1/services
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index b26fd863d..8ffb0fe31 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -29,6 +29,9 @@ libidl-install:
$(IDIR_LIBIDL)/usr/lib
libidl-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/include
+ $(CP) $(WRKINST)/usr/include/* \
+ $(IDIR_LIBIDL_DEV)/usr/include
$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
$(IDIR_LIBIDL_DEV)/usr/bin
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index db64efe10..491163cde 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -14,9 +14,14 @@ PKG_BUILDDEP:= libIDL
PKG_URL:= http://projects.gnome.org/ORBit2/
PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
+PKG_SUBPKGS:= ORBIT2 ORBIT2_DEV
+PKGSD_ORBIT2_DEV:= orbit2 headers
+PKGSC_ORBIT2_DEV:= devel
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags)
LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs)
@@ -38,8 +43,19 @@ orbit2-install:
$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
$(IDIR_ORBIT2)/usr/lib
+ $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
+ $(IDIR_ORBIT2)/usr/bin
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
$(STAGING_DIR)/usr/bin
+orbit2-dev-install:
+ $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/include
+ $(CP) $(WRKINST)/usr/include/* \
+ $(IDIR_ORBIT2_DEV)/usr/include
+ $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+ $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+ $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 3ce9d6a19..cd3fdbe2e 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,8 +4,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= qemu
-PKG_VERSION:= 0.13.0
-PKG_RELEASE:= 2
+PKG_VERSION:= 0.14.0
+PKG_RELEASE:= 1
PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421
PKG_DESCR:= cpu and system emulator
PKG_SECTION:= misc
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= zlib sdl
PKG_URL:= http://wwww.qemu.org/
PKG_SITES:= http://wiki.qemu.org/download/
-PKG_ARCH_DEPENDS:= x86 x86_64
+PKG_ARCH_DEPENDS:= native x86 x86_64
include $(TOPDIR)/mk/package.mk
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \
--prefix=/usr \
--sysconfdir=/etc \
--bindir=/usr/bin
-TARGET_LDFLAGS+= -pthread -lrt
+TARGET_LDFLAGS+= -pthread -lm -lrt
post-install:
$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 00:48:01 +0000