Skip to content

Commit

Permalink
noux-pkg: fix openssh with new ldso
Browse files Browse the repository at this point in the history
tl;dr we do not have __progname, so do not use it

Our current openssh port uses compat code which wants to use
__progname because our libc is FreeBSD based and the check for this
symbol is successful. This symbol was defined in our old ldso because
it was based on rtld from FreeBSD.
  • Loading branch information
cnuke committed Jan 6, 2015
1 parent 659f6ff commit 89c4911
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 2 deletions.
2 changes: 1 addition & 1 deletion repos/ports/ports/openssh.hash
@@ -1 +1 @@
1fd2a873bde35417c4e3a9153c1f5a035d072712
2287ee628edc9d776ed1063780a3a63b1e32653a
2 changes: 1 addition & 1 deletion repos/ports/run/noux_net_openssh_interactive.run
Expand Up @@ -80,7 +80,7 @@ append_if [have_spec sdl] config {

append_if [have_spec pci] config {
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="PCI"/></provides>
</start>}

Expand Down
44 changes: 44 additions & 0 deletions repos/ports/src/noux-pkg/openssh/progname_check.patch
@@ -0,0 +1,44 @@
Though we use FreeBSD libc we actually do not have __progname. As interim
fix we just remove the check from configure.
--- src/noux-pkg/openssh/configure
@@ -14415,40 +14415,6 @@

fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
-$as_echo_n "checking if libc defines __progname... " >&6; }
-if ${ac_cv_libc_defines___progname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
- extern char *__progname; printf("%s", __progname);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_libc_defines___progname="yes"
-else
- ac_cv_libc_defines___progname="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
-$as_echo "$ac_cv_libc_defines___progname" >&6; }
-if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
-
-$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
-
-fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC implements __FUNCTION__" >&5
$as_echo_n "checking whether $CC implements __FUNCTION__... " >&6; }

0 comments on commit 89c4911

Please sign in to comment.