Changeset 32129


Ignore:
Timestamp:
2012-06-08T17:10:18+02:00 (6 years ago)
Author:
nbd
Message:

make librpc compatible with eglibc, unconditionally enable it for packages that need rpc support

Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Config.in

    r26493 r32129  
    2222config BUSYBOX_USE_LIBRPC 
    2323        bool 
    24         depends USE_UCLIBC 
    2524        default y if BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
    2625 
  • trunk/package/librpc/Makefile

    r29484 r32129  
    1010PKG_SOURCE_VERSION:=0a2179bbc0844928f2a0ec01dba93d9b5d6d41a7 
    1111PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz 
    12  
    13 ifndef CONFIG_NATIVE_TOOLCHAIN 
    14  ifndef CONFIG_EXTERNAL_TOOLCHAIN 
    15   ifdef CONFIG_USE_UCLIBC 
    16     BUILD_LIBRPC=1 
    17   endif 
    18  endif 
    19 endif 
    20  
    21 ifdef BUILD_LIBRPC 
    22   CMAKE_INSTALL:=1 
    23 endif 
     12CMAKE_INSTALL:=1 
    2413 
    2514include $(INCLUDE_DIR)/package.mk 
     
    3019  CATEGORY:=Libraries 
    3120  TITLE:=uClibc RPC library 
    32   MDEPENDS:=@USE_UCLIBC 
    3321endef 
    3422 
    35 ifdef BUILD_LIBRPC 
    36   define Package/librpc/install 
     23define Package/librpc/install 
    3724        $(INSTALL_DIR) $(1)/lib/ 
    3825        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/ 
    39   endef 
    40 else 
    41   define Build/Prepare 
    42   endef 
    43  
    44   define Build/Configure 
    45   endef 
    46  
    47   define Build/Compile 
    48   endef 
    49  
    50   define Build/Install 
    51   endef 
    52  
    53   define Package/librpc/install 
    54         true 
    55   endef 
    56 endif 
     26endef 
    5727 
    5828$(eval $(call BuildPackage,librpc)) 
  • trunk/rules.mk

    r32075 r32129  
    120120LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A)) 
    121121endif 
    122 ifdef CONFIG_USE_UCLIBC 
    123122LIBRPC=-lrpc 
    124 endif 
    125 LIBRPC_DEPENDS=+USE_UCLIBC:librpc 
     123LIBRPC_DEPENDS=+librpc 
    126124 
    127125ifndef DUMP 
Note: See TracChangeset for help on using the changeset viewer.