[packages] libtorrent: apply fix from [22233] to armeb as well

[openwrt/svn-archive/archive.git] / libs / libatomicops / Makefile

diff --git a/libs/libatomicops/Makefile b/libs/libatomicops/Makefile
index 8f2098806a7ab71eedc3a1901028312913985560..b82d9402d9fcee6b19bfbfc3400f87a2c69aeb09 100644 (file)
--- a/libs/libatomicops/Makefile
+++ b/libs/libatomicops/Makefile
@@ -1,23 +1,24 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libatomicops
 PKG_VERSION:=1.2
-PKG_RELEASE:=1
+PKG_EXTRA_VERSION:=+cvs20080819.orig
+PKG_RELEASE:=2
 
-PKG_SOURCE:=libatomic_ops-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.hpl.hp.com/research/linux/atomic_ops/download/
-PKG_MD5SUM:=1b65e48271c81e3fa2d7a9a69bab7504
+PKG_SOURCE:=libatomic-ops_$(PKG_VERSION)$(PKG_EXTRA_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/liba/libatomic-ops/
+PKG_MD5SUM:=bf26c062f28796e3daaab586a38abec1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libatomic_ops-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,6 +26,7 @@ define Package/libatomicops
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=implementations for atomic memory update operations
+  DEPENDS:=@!TARGET_avr32
   URL:=http://www.hpl.hp.com/research/linux/atomic_ops/
 endef
 
@@ -38,28 +40,18 @@ define Package/libatomicops/description
   architectures.
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/src/atomic_ops $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatomic_ops*.a $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/atomic_ops{,_malloc,_stack}.h \
-               $(STAGING_DIR)/usr/include/atomic_ops \
-               $(STAGING_DIR)/usr/lib/libatomic_ops{,_gpl}.a
-endef
-
 $(eval $(call BuildPackage,libatomicops))