diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-08-22 06:45:16 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-08-22 06:45:16 +0800 |
| commit | 0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4 (patch) | |
| tree | 1081cb519359d5894d247d207cf0c7d2b7eac55d | |
| parent | 25352eedea45ab72532046f33929ae090aa7937f (diff) | |
| download | xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar.gz xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar.bz2 xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar.lz xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar.xz xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.tar.zst xorg-devel-ports-0a09d822ddaa34f95d0deb3e4a7c7db0f5c973f4.zip | |
Fix packaging in poudriere: Add depends on autotools. Move autogen.sh block to
pre-configure, since in post-patch there aren't any dependancies installed.
Kill double white line. Add p0 to be sure patch doesn't choke on patches.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1080 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index ec6ea32..2c0df84 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -42,7 +42,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib - CONFIGURE_ARGS+=--disable-silent-rules .if ${OSVERSION} < 1000033 @@ -51,6 +50,7 @@ CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif .if defined(WITH_NEW_XORG) +USE_AUTOTOOLS= autoconf:env automake:env libtool # probably be shared lib, and in it own port. CONFIGURE_ARGS+= --enable-shared-glapi=no # we need to reapply these patches because we doing wierd stuff with autogen @@ -104,21 +104,24 @@ CONFIGURE_ARGS+= --enable-xcb post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ ${WRKSRC}/configure +.if !defined(WITH_NEW_XORG) + @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/src/glu/Makefile \ + ${WRKSRC}/src/mesa/Makefile \ + ${WRKSRC}/src/mesa/drivers/dri/Makefile +.endif + +pre-configure: # workaround for stupid rerunning configure in do-build step # xxx .if defined(WITH_NEW_XORG) cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh . for file in ${REAPPLY_PATCHES} - @cd ${WRKSRC} && ${PATCH} --quiet < ${file} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} . endfor # make sure the pkg-config files are installed in the correct place. # this was reverted by running autogen.sh @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; -.else - @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/src/glu/Makefile \ - ${WRKSRC}/src/mesa/Makefile \ - ${WRKSRC}/src/mesa/drivers/dri/Makefile .endif |