Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Homebrew/homebrew
base: master
...
head fork: niw/homebrew
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 09, 2013
@niw niw FIX: gd head is using cmake.
FIX: Address dyld claiming "Symbol not found: _overflow2".

Generate pc file for HEAD, use std_cmake_parameters.

Cover @jacknagel comments.
aecf5c9
Showing with 18 additions and 5 deletions.
  1. +18 −5 Library/Formula/gd.rb
View
23 Library/Formula/gd.rb
@@ -17,6 +17,7 @@ class Gd < Formula
depends_on 'jpeg' => :recommended unless build.include? "without-jpeg"
depends_on 'giflib' if build.include? "with-giflib"
depends_on :freetype if build.include? "with-freetype" or MacOS::X11.installed?
+ depends_on 'cmake' => :build if ARGV.build_head?
fails_with :llvm do
build 2326
@@ -24,10 +25,22 @@ class Gd < Formula
end
def install
- args = ["--prefix=#{prefix}"]
- args << "--without-freetype" unless build.include? 'with-freetype'
- system "./configure", *args
- system "make install"
+ ENV.x11
+ if ARGV.build_head?
+ mkdir "build" do
+ system "cmake", "..", *std_cmake_args
+ system "make install"
+ end
+ else
+ args = [
+ "--prefix=#{prefix}",
+ "MACOSX_DEPLOYMENT_TARGET=#{MACOS_VERSION}"
+ ]
+ args << "--without-freetype" unless build.include? 'with-freetype'
+ system "./configure", *args
+ system "make install"
+ system "make install"
+ end
(lib+'pkgconfig/gdlib.pc').write pkg_file
end
@@ -41,7 +54,7 @@ def pkg_file; <<-EOF
Name: gd
Description: A graphics library for quick creation of PNG or JPEG images
-Version: 2.0.36RC1
+Version: #{version}
Requires:
Libs: -L${libdir} -lgd
Libs.private: -ljpeg -lpng12 -lz -lm

No commit comments for this range

Something went wrong with that request. Please try again.