Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Dec 2014 23:38:47 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r374558 - in head/graphics/exact-image: . files
Message-ID:  <201412112338.sBBNclDq045823@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Dec 11 23:38:46 2014
New Revision: 374558
URL: https://svnweb.freebsd.org/changeset/ports/374558
QAT: https://qat.redports.org/buildarchive/r374558/

Log:
  - Unbreak on amd64 by respecting C*FLAGS
  - Minor whitespace fix
  
  Approved by:	portmgr blanket
  MFH:		2014Q4

Added:
  head/graphics/exact-image/files/patch-build__bottom.make   (contents, props changed)
Modified:
  head/graphics/exact-image/Makefile

Modified: head/graphics/exact-image/Makefile
==============================================================================
--- head/graphics/exact-image/Makefile	Thu Dec 11 23:26:09 2014	(r374557)
+++ head/graphics/exact-image/Makefile	Thu Dec 11 23:38:46 2014	(r374558)
@@ -24,7 +24,6 @@ LIB_DEPENDS=	libagg.so:${PORTSDIR}/graph
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
-CFLAGS+=	-fPIC
 #hack to get custom exactcode configure script to enable tiff support with
 #broken headers on c++ in base system:
 CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
@@ -32,15 +31,13 @@ USES=		gmake perl5 pkgconfig python tar:
 USE_XORG=	x11
 HAS_CONFIGURE=	yes
 INSTALL_WRKSRC=	${WRKSRC}/objdir
-BINS=	bardecode econvert edentify empty-page hocr2pdf optimize2bw
+BINS=		bardecode econvert edentify empty-page hocr2pdf optimize2bw
 PLIST_FILES=	${BINS:S|^|bin/|} \
 		%%SITE_PERL%%/ExactImage.so \
 		%%SITE_PERL%%/ExactImage.pm \
 		%%PYTHON_SITELIBDIR%%/ExactImage.py \
 		%%PYTHON_SITELIBDIR%%/_ExactImage.so
 
-BROKEN_amd64=	Fails to link
-
 post-extract:
 	@${RM} -rf ${WRKSRC}/agg-2.4/
 

Added: head/graphics/exact-image/files/patch-build__bottom.make
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/exact-image/files/patch-build__bottom.make	Thu Dec 11 23:38:46 2014	(r374558)
@@ -0,0 +1,31 @@
+--- build/bottom.make.orig	2010-07-22 18:35:17.000000000 +0400
++++ build/bottom.make	2014-12-12 00:07:13.000000000 +0300
+@@ -43,23 +43,23 @@
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.c
+ 	@echo '  C         $@'
+-	$(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.m
+ 	@echo '  ObjC      $@'
+-	$(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $($(X_MODULE)_OUTPUT)/%.cc
+ 	@echo '  C++       $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.cc
+ 	@echo '  C++       $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.mm
+ 	@echo '  ObjC++    $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ # only implicit rules if one binary per module ...
+ ifeq ($(words $(BINARY)), 1)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412112338.sBBNclDq045823>