Bug 180361 - [PATCH] graphics/png: Build correctly when WITH_DEBUG is set.
[PATCH] graphics/png: Build correctly when WITH_DEBUG is set.
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Dirk Meyer
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-07-07 11:50 UTC by Raphael Kubo da Costa
Modified: 2013-07-11 05:49 UTC (History)
1 user (show)

See Also:


Attachments
png-1.5.17.patch (1.84 KB, patch)
2013-07-07 11:50 UTC, Raphael Kubo da Costa
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Raphael Kubo da Costa freebsd_committer 2013-07-07 11:50:00 UTC
Unmark BROKEN when WITH_DEBUG is set: by patching CMakeLists.txt, it is
possible to generate binaries and libraries without the "d" suffix. Adjust
pkg-plist not to hardcode "release" in the CMake configuration files that are
installed.

Port maintainer (dinoex@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer 2013-07-07 11:50:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter freebsd_committer 2013-07-11 05:02:20 UTC
Author: dinoex
Date: Thu Jul 11 04:02:06 2013
New Revision: 322738
URL: http://svnweb.freebsd.org/changeset/ports/322738

Log:
  - fix build when DEBUG is set
  PR:		180361
  Submitted by:	Raphael Kubo da Costa

Added:
  head/graphics/png/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/png/Makefile
  head/graphics/png/pkg-plist

Modified: head/graphics/png/Makefile
==============================================================================
--- head/graphics/png/Makefile	Wed Jul 10 23:59:46 2013	(r322737)
+++ head/graphics/png/Makefile	Thu Jul 11 04:02:06 2013	(r322738)
@@ -31,10 +31,6 @@ APNG_DESC=Enable Animated PNG support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
-BROKEN=		Please remove WITH_DEBUG for this port
-.endif
-
 .if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL)
 MASTER_SITES+=	SF/apng/libpng/libpng15/:apng
 DISTFILES+=	${DISTNAME}-apng.patch.gz:apng

Added: head/graphics/png/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/png/files/patch-CMakeLists.txt	Thu Jul 11 04:02:06 2013	(r322738)
@@ -0,0 +1,12 @@
+--- CMakeLists.txt~	2013-07-07 13:31:51.000000000 +0300
++++ CMakeLists.txt	2013-07-07 13:32:01.000000000 +0300
+@@ -59,9 +59,6 @@
+ # SET LIBNAME
+ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
+ 
+-# to distinguish between debug and release lib
+-set(CMAKE_DEBUG_POSTFIX "d")
+-
+ # Use the prebuilt pnglibconf.h file from the scripts folder
+ # TODO: fix this by building with awk; without this no cmake build can be
+ # configured directly (to do so indirectly use your local awk to build a

Modified: head/graphics/png/pkg-plist
==============================================================================
--- head/graphics/png/pkg-plist	Wed Jul 10 23:59:46 2013	(r322737)
+++ head/graphics/png/pkg-plist	Thu Jul 11 04:02:06 2013	(r322738)
@@ -14,7 +14,7 @@ lib/libpng.a
 lib/libpng.so
 libdata/pkgconfig/libpng15.pc
 libdata/pkgconfig/libpng.pc
-lib/libpng/libpng15-release.cmake
+lib/libpng/libpng15-%%CMAKE_BUILD_TYPE%%.cmake
 lib/libpng/libpng15.cmake
 lib/libpng15.a
 lib/libpng15.so
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Dirk Meyer freebsd_committer 2013-07-11 05:49:03 UTC
State Changed
From-To: open->closed


committed with cosmetic changes, thanks.