Commits

Marcus Calhoun-Lopez authored aafac220fda
jpeg: Prevent linker from finding wrong library and header files. Fixes https://trac.macports.org/ticket/16411 (maintainer timeout). Revision not increased because the library should have built correctly or not at all.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@47969 d073be05-634f-4543-b044-5fe20cf6d1d6
No tags

graphics/jpeg/Portfile

Modified
33 33
34 34 checksums ${jpegmain} md5 dbd5f3b47ed13132f04c685d608a7547 \
35 35 droppatch.tar.gz md5 511c39779ac96cd41ca1e0a87b239287
36 36 extract.only ${jpegmain}
37 37
38 38 patchfiles patch-config.sub patch-config.guess patch-ltmain.sh \
39 39 patch-ltconfig patch-makefile.cfg patch-jpeglib.h
40 40 post-patch {
41 41 system "cd ${worksrcpath} &&
42 42 tar zxf ${distpath}/droppatch.tar.gz"
43 +
44 + # Reorder link flags so that so that local -L options come first (especially before -L${prefix}/lib)
45 + # (see http://trac.macports.org/ticket/16411).
46 + reinplace "s|\\(.*\\)\\(\$(LDFLAGS)\\)\\(.*\\)\\(\$(LDLIBS)\\)\\(.*\\)|\\1\\4\\3\\2\\5|" ${worksrcpath}/makefile.cfg
47 +
48 + # As in the case of -L, CPPFLAGS come before -I. during compilation.
49 + configure.cppflags-append -isystem${prefix}/include
50 + configure.cppflags-delete -I${prefix}/include
43 51 }
44 52
45 53 configure.args --enable-shared --enable-static
46 54
47 55 use_parallel_build yes
48 56
49 57 destroot.destdir prefix=${destroot}${prefix}
50 58 pre-destroot {
51 59 xinstall -d ${destroot}${prefix}/bin
52 60 xinstall -d ${destroot}${prefix}/share/man/man1

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut