[MacPorts] #33899: curl builds incorrectly when +universal ppc i386 x86_64
#33899: curl builds incorrectly when +universal ppc i386 x86_64 ----------------------------------------------------+----------------------- Reporter: jeremyhu@… | Owner: ryandesign@… Type: defect | Status: new Priority: Normal | Milestone: Component: ports | Version: 2.0.4 Keywords: universal muniversal merger_no_3_archs | Port: curl ----------------------------------------------------+----------------------- Install curl +universal with ppc i386 x86_64 as the chosen arch. muniversal incorrectly merges the header files. Take this block in ${prefix}/include/curl/curlbuild.h for example: {{{ /* The size of `long', as computed by sizeof. */ #if defined (__i386__) || defined(__x86_64__) #ifndef __LP64__ #endif #define CURL_SIZEOF_LONG 4 #if defined (__i386__) || defined(__x86_64__) #else /* __LP64__ */ #define CURL_SIZEOF_LONG 8 #endif /* __LP64__ */ #endif }}} This came from -intel (which was correctly merged from i386 and x86_64): {{{ /* The size of `long', as computed by sizeof. */ #ifndef __LP64__ #define CURL_SIZEOF_LONG 4 #else /* __LP64__ */ #define CURL_SIZEOF_LONG 8 #endif /* __LP64__ */ }}} and from -powerpc (which was correctly just powerpc): {{{ /* The size of `long', as computed by sizeof. */ #define CURL_SIZEOF_LONG 4 }}} -- Ticket URL: <https://trac.macports.org/ticket/33899> MacPorts <http://www.macports.org/> Ports system for Mac OS
#33899: curl builds incorrectly when +universal ppc i386 x86_64 ---------------------------------------------------+------------------------ Reporter: jeremyhu@… | Owner: ryandesign@… Type: defect | Status: new Priority: Normal | Milestone: Component: ports | Version: 2.0.4 Keywords: universal muniversal merger_dont_diff | Port: curl ---------------------------------------------------+------------------------ Changes (by jeremyhu@…): * keywords: universal muniversal merger_no_3_archs => universal muniversal merger_dont_diff -- Ticket URL: <https://trac.macports.org/ticket/33899#comment:1> MacPorts <http://www.macports.org/> Ports system for Mac OS
#33899: curl builds incorrectly when +universal ppc i386 x86_64 ---------------------------------------------------+------------------------ Reporter: jeremyhu@… | Owner: ryandesign@… Type: defect | Status: new Priority: Normal | Milestone: Component: ports | Version: 2.0.4 Keywords: universal muniversal merger_dont_diff | Port: curl ---------------------------------------------------+------------------------ Comment(by jeremyhu@…): {{{ Index: Portfile =================================================================== --- Portfile (revision 91542) +++ Portfile (working copy) @@ -8,6 +8,7 @@ name curl # keep the version in sync with the curl-ca-bundle port version 7.25.0 +revision 1 categories net www maintainers ryandesign license curl @@ -78,6 +79,9 @@ } } +global merger_dont_diff merger_configure_env +set merger_dont_diff "${prefix}/include/curl/curlbuild.h" + post-destroot { set docdir ${prefix}/share/doc/${name} xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl }}} -- Ticket URL: <https://trac.macports.org/ticket/33899#comment:2> MacPorts <http://www.macports.org/> Ports system for Mac OS
#33899: curl builds incorrectly when +universal ppc i386 x86_64 ------------------------------------+--------------------------------------- Reporter: jeremyhu@… | Owner: ryandesign@… Type: defect | Status: closed Priority: Normal | Milestone: Component: ports | Version: 2.0.4 Resolution: fixed | Keywords: universal muniversal merger_dont_diff Port: curl | ------------------------------------+--------------------------------------- Changes (by jeremyhu@…): * status: new => closed * resolution: => fixed Comment: r92443 -- Ticket URL: <https://trac.macports.org/ticket/33899#comment:3> MacPorts <http://www.macports.org/> Ports system for Mac OS
participants (1)
-
MacPorts