pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: CVS commit: pkgsrc/converters/php-iconv



> I don't understand this change.  The whole section is wrapped in
> "${USE_BUILTIN.iconv:U:tl} == no", so now even though I'm using libiconv from pkgsrc, it's going to hardcode iconv to use some non-existent path, in my case:
> 
>  /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk//opt/pkg
> 
> which is almost certainly going to fail.
> 
> It would really help to have some decent comments explaining what the actual problem is here and what we are actually trying to fix, because these commits just appear to be breaking things and I 
> don't understand why.

I think this should be correct:


.if ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
# Hack: allow building on Darwin without Command Line Tools.
.  if ${USE_BUILTIN.iconv:U:tl} == yes && ${OPSYS} == "Darwin" && !exists(/usr/include/iconv.h)
CONFIGURE_ARGS+=        --with-iconv=shared,${OSX_SDK_PATH:Q}/${BUILDLINK_PREFIX.iconv}
.  else
CONFIGURE_ARGS+=        --with-iconv=shared,${BUILDLINK_PREFIX.iconv}
.  endif
.else
CONFIGURE_ARGS+=        --with-iconv
.endif


Note:

There shouldn't be a case then BUILTIN_LIB_FOUND.iconv is "no" and USE_BUILTIN.iconv is "yes", as PkgSrc guarantees libiconv is always installed and found. So the original condition: 
USE_BUILTIN.iconv == "no" and BUILTIN_LIB_FOUND.iconv == "yes" can be reduced to just the latter.

The hack is for the case when: it's macOS, built-in iconv is desired, and /usr/include/iconv.h doesn't exist.


Commit?

Adam


Home | Main Index | Thread Index | Old Index