[OpenWrt-Devel] [PATCH v2] [package] busybox: Fix pam_start link errors when PAM support is enabled

[Stephen Parry]

Can someone please give me some feedback as to whether this patch now
meets the canonical standard, and whether it's likely to get applied. I
have a number of others to come and I would like to make sure I get them
right.

Thanks,

Stephen Parry

On 17/08/14 23:30, Stephen Parry wrote:
> Patch to BusyBox Makefile to fix linker errors when PAM support is enabled by
> CONFIG_BUSYBOX_CONFIG_PAM=y. Typical errors include:
> login.c:(.text.login_main+0x122): undefined reference to `pam_start'
> 
> Signed-off-by: Stephen Parry <sgparry at mainscreen.com>
> ---
> New version of patch - now against trunk and using git
>  package/utils/busybox/Makefile | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
> index 3380885..668679e 100644
> --- a/package/utils/busybox/Makefile
> +++ b/package/utils/busybox/Makefile
> @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
>  		http://distfiles.gentoo.org/distfiles/
>  PKG_MD5SUM:=337d1a15ab1cb1d4ed423168b1eb7d7e
>  
> -PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc
> +PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam
>  PKG_BUILD_PARALLEL:=1
>  PKG_CHECK_FORMAT_SECURITY:=0
>  
> @@ -42,7 +42,7 @@ define Package/busybox
>    MAINTAINER:=Felix Fietkau <nbd at openwrt.org>
>    TITLE:=Core utilities for embedded Linux
>    URL:=http://busybox.net/
> -  DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc
> +  DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam
>    MENU:=1
>  endef
>  
> @@ -80,6 +80,12 @@ ifdef CONFIG_BUSYBOX_USE_LIBRPC
>    LDLIBS += rpc
>  endif
>  
> +ifdef CONFIG_BUSYBOX_CONFIG_PAM
> +  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
> +  export LDFLAGS=$(TARGET_LDFLAGS)
> +  LDLIBS += pam pam_misc pthread
> +endif
> +
>  define Build/Compile
>  	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
>  		CC="$(TARGET_CC)" \
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel