makepkg.conf: Stripping /usr/local Docs Out Of Builds?

adamlau · 2009-03-29 19:18:42

Trying to strip out '/usr/local/gtk-doc/html' out of builds without resorting to 'without-html-dir'. Tried the following individually within makepkg.conf with no effect:

OPTIONS=(!docs)

DOC_DIRS=({usr{,/local}{,/share},opt/*}/{doc,gtk-doc}
DOC_DIRS=({usr{,/local}{,/share},opt/*}/{doc,gtk-doc{,/html}}
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc{,/html}} opt/*/{doc,gtk-doc{,/html}})

All fo the above appear to echo properly. No options=() within any PKGBUILD files I am testing. How to strip '/usr/local/gtk-doc/html' out of builds using makepkg.conf (would rather not add an 'rm' statement to each and every PKGBUILD)?

Last edited by adamlau (2009-03-29 21:43:48)

adamlau · 2009-03-29 21:34:24

[Issue remains unsolved...]

Last edited by adamlau (2009-03-29 22:13:30)

dyscoria · 2009-03-29 22:37:58

Try this:

DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc} usr/local/{,share/}{info,doc,gtk-doc})

Have not tested it though.

adamlau · 2009-03-29 22:58:17

No go, even though it echos the same as

DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})

Which should be good to go, but is not....

Allan · 2009-03-29 23:52:22

Do you have a ~/.makepkg.conf that is overriding the /etc/makepkg.conf?

adamlau · 2009-03-30 02:07:21

Bouble-check my aliases, my mistake. The issue exists with makepkg-git and not makepkg release. makepkg-git !libtool does not appear to work either.

Last edited by adamlau (2009-03-30 02:14:47)

Allan · 2009-03-30 02:18:11

You do realise that makepkg-git uses /etc/makepkg-git.conf? I think the !libtool code has not been touched since the last release so I would be surprised if it was not working.

adamlau · 2009-03-30 02:27:34

Correct. This is my /etc/makepkg-git.conf (makepkg.conf backed up and removed from /etc):

DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
          'rsync::/usr/bin/rsync -z %u %o'
          'scp::/usr/bin/scp -C %u %o')

CARCH="i686"
CHOST="i686-pc-linux-gnu"

CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
CXXFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
LDFLAGS="-Wl,-O1,--as-needed,--hash-style=gnu"
#MAKEFLAGS="-j2"

BUILDENV=(fakeroot !distcc color !ccache !xdelta)

OPTIONS=(strip !docs !libtool !emptydirs zipman purge)

INTEGRITY_CHECK=(md5)
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)

PKGEXT='.pkg.tar.gz'
SRCEXT='.src.tar.gz'

Allan · 2009-03-30 06:43:28

I just tested the !libtool option in makepkg-git and it works for me.

adamlau · 2009-03-30 07:03:31

I just built libsoup 2.26.0 and squeeze 0.2.3 and both packages were left with .la files. And /usr/local/gtk-docs/html files were not stripped out. Using the above makepkg-git.conf. Odd...

Allan · 2009-03-30 07:15:56

Oh, crap... found the bug! This is a good catch

I tested a split package and everything works then. It appears tidy_install is not being called when there is only a build() function. If there is a package() function or we are doing package splitting, all is good. That is how I could not replicate.

I will find a fix and post a new makepkg-git package soon.

Allan · 2009-03-30 11:54:16

New makepkg-git can be downloaded here: http://dev.archlinux.org/~allan/makepkg-git.html

adamlau · 2009-03-30 17:01:28

Currently breaks when building from the PKGBUILD.

Allan · 2009-03-30 23:40:46

What exactly breaks?

adamlau · 2009-03-31 00:55:40

When building from the updated makepkg-get PKGBUILD with an unmodified makepkg.conf, the package (when decompressed) contains "pkg/usr/share/pacman/PKGBUILD-split.proto" only_and _nothing else. Perhaps you could build an updated i686 package to verify as the existing i686 package appears to be unchanged.

Last edited by adamlau (2009-03-31 00:57:00)

Allan · 2009-03-31 02:00:29

Oops... uploaded the new packages and forgot to change the links on the web page. I'm used to just putting things in a repo and all the web pages being updated.

Anyway, I can not see why you are not getting the full package built from the posted PKGBUILD. Are you getting errors in your build output?

adamlau · 2009-03-31 05:09:26

No errors, package builds fine but with "pkg/usr/share/pacman/PKGBUILD-split.proto" only. Other dirs created, but empty. i686 package verified working (.la and doc files stripped as expected, at least). Good work, Allan!

adamlau · 2009-03-31 21:57:09

Also, what about replacing DOC_DIRS with:

DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})

To satisfy doc stripping for /usr/local? That way, it would be consistent with man compression and bin stripping paths...

Allan · 2009-04-01 07:34:20

I will add that before release.

Arch Linux

#1 2009-03-29 19:18:42

makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#2 2009-03-29 21:34:24

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#3 2009-03-29 22:37:58

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#4 2009-03-29 22:58:17

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#5 2009-03-29 23:52:22

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#6 2009-03-30 02:07:21

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#7 2009-03-30 02:18:11

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#8 2009-03-30 02:27:34

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#9 2009-03-30 06:43:28

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#10 2009-03-30 07:03:31

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#11 2009-03-30 07:15:56

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#12 2009-03-30 11:54:16

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#13 2009-03-30 17:01:28

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#14 2009-03-30 23:40:46

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#15 2009-03-31 00:55:40

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#16 2009-03-31 02:00:29

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#17 2009-03-31 05:09:26

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#18 2009-03-31 21:57:09

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

#19 2009-04-01 07:34:20

Re: makepkg.conf: Stripping /usr/local Docs Out Of Builds?

Board footer