ossp-uuid patch pkg-config to use configured dirs #43889

bluca · 2015-09-13T22:11:56Z

Patch ossp-uuid/uuid.pc.in to use the configure directories for includes. Also bump revision from 1 to 2.
Unfortunately from the look of upstream's CVS repository it seems it has been inactive for years, so I'm afraid the chances of a new release are quite low.

Tested on Debian via LinuxBrew:

$ bin/brew install ossp-uuid
Warning: Formula file is modified!
Building from source because Library/Formula/ossp-uuid.rb has local changes
To install from a bottle instead, run with --force-bottle
/usr/bin/gcc-4.2: not found (maybe gcc-4.2 is not installed?)
==> Downloading http://ftp.de.debian.org/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz
Already downloaded: /home/luca/.cache/Homebrew/ossp-uuid-1.6.2.tar.gz
==> Patching
patching file uuid.pc.in
==> ./configure --prefix=/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2 --includedir=/home/luca/git/linuxbrew/Cella
==> make
==> make install
/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2: 16 files, 292K, built in 4 seconds
$ PKG_CONFIG_PATH=/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2/lib/pkgconfig pkg-config --libs --cflags uuid
-I/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2/include/ossp -L/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2/lib -luuid

pkg-config now returns correctly <...>include/ossp instead of <...>/include.

Fixes issue #43843, upstream ticket: http://cvs.ossp.org/tktview?tn=200

dunn · 2015-09-13T22:39:29Z

Library/Formula/ossp-uuid.rb

@@ -32,4 +32,20 @@ def install
    system "make"
    system "make", "install"
  end
+
+  patch :DATA


This line should go above the install block, and the explanatory comments should go above it.

Fixed, thanks.

DomT4 · 2015-09-13T22:47:16Z

Library/Formula/ossp-uuid.rb

+# patch: upstream ticket: http://cvs.ossp.org/tktview?tn=200
+# pkg-config --cflags uuid returns the wrong directory since we override the
+# default, but uuid.pc.in does not use it
+  patch :DATA


You can use an inreplace here rather than a patch. It's a bit neater.

Done, thanks.

bluca · 2015-09-15T00:38:06Z

Testing locally via LinuxBrew, looks like failure to build RPM is unrelated to this diff. The error happens when building the internal version of BeeCrypt, and it's due to the march=core2 being set by default. Adding:

ENV['CFLAGS'] = '-march=x86-64'
ENV['CXXFLAGS'] = '-march=x86-64'

to rpm.rb fixes the build issue.

Any suggestions?

tdsmith · 2016-04-10T01:03:30Z

@BrewTestBot test this please

uuid is being built passing include/ossp as the headers target install directory, but uuid.pc.in is not picking it up and as a result pkg-config returns the wrong directory, breaking build systems that rely on it.

DomT4 · 2016-04-17T17:13:40Z

Merged in Homebrew/homebrew-core@8cf1f47. Thank you for your contribution to Homebrew @bluca; we appreciate it! 😺

bluca · 2016-04-17T17:17:22Z

Thanks for merging!

bluca · 2016-04-17T18:03:30Z

@DomT4 - mmh I now see this error in Travis:

$ brew update; brew install ossp-uuid binutils valgrind
==> Migrating Homebrew to v0.9.9
remote: Counting objects: 462, done.
remote: Compressing objects: 100% (420/420), done.
remote: Total 462 (delta 28), reused 273 (delta 17), pack-reused 0
Receiving objects: 100% (462/462), 745.81 KiB | 0 bytes/s, done.
Resolving deltas: 100% (28/28), done.
From https://github.com/Homebrew/brew
 + 53c5089...8e42077 master     -> origin/master  (forced update)
HEAD is now at 8e42077 list: exclude zsh completions from unbrewed
==> Tapping homebrew/core
Cloning into '/usr/local/Library/Taps/homebrew/homebrew-core'...
remote: Counting objects: 3662, done.
remote: Compressing objects: 100% (3547/3547), done.
remote: Total 3662 (delta 16), reused 480 (delta 3), pack-reused 0
Receiving objects: 100% (3662/3662), 2.79 MiB | 0 bytes/s, done.
Resolving deltas: 100% (16/16), done.
Checking connectivity... done.
Tapped 3537 formulae (3,688 files, 8.7M)
Already up-to-date.
Error: ossp-uuid-1.6.2_1 already installed
To install this version, first `brew unlink ossp-uuid`

I see no issues with linuxbrew:

$ bin/brew install ossp-uuid
Warning: Formula file is modified!
Building from source because Library/Formula/ossp-uuid.rb has local changes
To install from a bottle instead, run with --force-bottle
/usr/bin/gcc-4.2: not found (maybe gcc-4.2 is not installed?)
==> Downloading http://ftp.de.debian.org/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz
Already downloaded: /home/luca/.cache/Homebrew/ossp-uuid-1.6.2.tar.gz
==> ./configure --prefix=/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2 --includedir=/home/luca/git/linuxbrew/Cella
==> make
==> make install
/home/luca/git/linuxbrew/Cellar/ossp-uuid/1.6.2_2: 16 files, 292K, built in 4 seconds

Was this a mistake on my part? The commit did update the revision from 1 to 2. Any idea what's the issue?

bluca · 2016-04-17T18:17:24Z

Ah, I see, it will error out if the previous revision was already installed.

Was it a mistake to update the revision?

DomT4 · 2016-04-17T18:35:01Z

Not particularly, in this case. As you highlighted yourself upstream is pretty much 💀 and we'd have been waiting a long time, if ever, to roll this out to users if we'd waited for that.

It's expected that if you run brew install on something that's already installed you'll get the error. Either something you're installing is pulling it in for you, or Travis pre-installs it by default which is a possibility. If you want to be error-safe there you could use brew reinstall which should plow on regardless.

bluca · 2016-04-17T18:44:20Z

Makes sense. Thanks!

bluca mentioned this pull request Sep 13, 2015

ossp/uuid.h location breaks CMake with pkg-config #43843

Closed

dunn reviewed Sep 13, 2015
View reviewed changes

bluca force-pushed the ossp-uuid-pkg-config branch from 6876148 to c698c19 Compare September 13, 2015 22:45

DomT4 reviewed Sep 13, 2015
View reviewed changes

bluca force-pushed the ossp-uuid-pkg-config branch 2 times, most recently from 0e03960 to 982433c Compare September 14, 2015 11:18

CoolOmar2020 mentioned this pull request Nov 25, 2015

Multiple errors when trying to install pkg-config #46365

Closed

mistydemeo mentioned this pull request Nov 25, 2015

Multiple errors when trying to install pkg-config Linuxbrew/legacy-linuxbrew#667

Closed

tdsmith self-assigned this Apr 10, 2016

ossp-uuid patch pkg-config to use configured dirs

f6f8232

uuid is being built passing include/ossp as the headers target install directory, but uuid.pc.in is not picking it up and as a result pkg-config returns the wrong directory, breaking build systems that rely on it.

bluca force-pushed the ossp-uuid-pkg-config branch from 982433c to f6f8232 Compare April 10, 2016 01:29

DomT4 closed this in Homebrew/homebrew-core@8cf1f47 Apr 17, 2016

Homebrew locked and limited conversation to collaborators Jul 10, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ossp-uuid patch pkg-config to use configured dirs #43889

ossp-uuid patch pkg-config to use configured dirs #43889

bluca commented Sep 13, 2015

dunn Sep 13, 2015

bluca Sep 13, 2015

DomT4 Sep 13, 2015

bluca Sep 14, 2015

bluca commented Sep 15, 2015

tdsmith commented Apr 10, 2016

DomT4 commented Apr 17, 2016

bluca commented Apr 17, 2016

bluca commented Apr 17, 2016

bluca commented Apr 17, 2016

DomT4 commented Apr 17, 2016

bluca commented Apr 17, 2016

ossp-uuid patch pkg-config to use configured dirs #43889

ossp-uuid patch pkg-config to use configured dirs #43889

Conversation

bluca commented Sep 13, 2015

dunn Sep 13, 2015

Choose a reason for hiding this comment

bluca Sep 13, 2015

Choose a reason for hiding this comment

DomT4 Sep 13, 2015

Choose a reason for hiding this comment

bluca Sep 14, 2015

Choose a reason for hiding this comment

bluca commented Sep 15, 2015

tdsmith commented Apr 10, 2016

DomT4 commented Apr 17, 2016

bluca commented Apr 17, 2016

bluca commented Apr 17, 2016

bluca commented Apr 17, 2016

DomT4 commented Apr 17, 2016

bluca commented Apr 17, 2016