1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-17 23:05:00 -05:00
Commit Graph

48 Commits

Author SHA1 Message Date
Dan McGee
e8806748ec Fix nonsensical replace
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-08-08 11:23:27 -05:00
Allan McRae
f569c4a042 makepkg: several small fixes
1) Do not attempt to strip compressed binaries
Original-work-by: Marc - A. Dahlhaus <mad@wol.de>

2) Add "\" in "GPL\'ed" so quote mark does not break source code highlighting

3) Add local to docdir paths in makepkg.conf for consistency

4) Use full path to sed in MacOSX in case users have GNU sed earlier in
path

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-05-11 21:23:46 -05:00
Xavier Chantry
b4e1365657 makepkg : remove xdelta support
The pkgdelta script can be used instead.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-02-28 15:42:07 -06:00
Xavier Chantry
4ec846f5ac makepkg : fix a lot of breakages caused by Allan
This patch started as a simple typo fix (pugre instead of purge in two
places), as well as a fix of a test which was using PURGE_TARGETS instead of
$PURGE_TARGETS.

It evolved in a slight handling change of the OPTIONS which have a variable
affecting their behavior (strip STRIP_DIRS, docs DOC_DIRS, zipman MAN_DIRS
and purge PURGE_TARGETS), as well as a clarification in makepkg.conf. Now
when a variable is undefined or empty, the corresponding option will have no
effect. It looked weird to have a fallback when a option is defined but
empty, it seems more natural to not have any fallbacks.

Also re-enable docs by default. It seems arbitrary to delete files from
packages by default, and it would be more vanilla and distro agnostic to
keep them. docs was also the only negated option.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-12 22:28:10 -06:00
Allan McRae
1cc8ad6112 makepkg: Add support for specifying LDFLAGS
Provide support for specifying LDFLAGS within makepkg.conf but leaves
this undefined by default. Fixes FS#12542.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03 00:17:15 -06:00
Allan McRae
8f26bb9052 makepkg: move BUILDSCRIPT from makepkg.conf
Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing
of options, breaking the -p option and --help output.  The solution
is to move BUILDSCRIPT out of makepkg.conf.  This patch moves the
definition BUILDSCRIPT back to makepkg itself and adds configure
option to allow easy changing of this value during build time.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03 00:13:54 -06:00
Allan McRae
9a7f68317a makepkg: Introduce purge option
The purge option, combined with the PURGE_TARGETS variable,
allows makepkg to automatically remove commonly confliting or
removed files (e.g. /usr/share/info/dir, *.pod).

Original work: Tim Yang
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03 00:11:51 -06:00
Allan McRae
bb9b19a6c4 makepkg: provide MAN_DIRS configuration variable
Provides a MAN_DIRS variable in makepkg.conf which can be used
to specify folders to look for manual (man and info) pages to be
compressed.  Useful for packages that install to /opt.  Also
clarifies that "zipman" means "zip manuals" and covers both man
and info pages.

Original work by: Tiago Pierezan Camargo <tcamargo at gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03 00:06:51 -06:00
Xavier Chantry
a06d0de104 makepkg.conf : some info / docs adjustements
After commit 7865fb9af4, info pages are now treated like man pages.
This means even with !docs, info pages will still be included. And including
info pages was the main reason the docs option was enabled by default
recently. So this is now longer needed, and we can revert back to !docs by
default for disabling gigantic html pages and other docs.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-08-25 18:05:25 -05:00
Xavier Chantry
7e8f1469c4 Remove DB_COMPRESSION and DB_CHECKSUMS from makepkg.conf
DB_COMPRESSION was only used in repo-add and DB_CHECKSUMS was not used
anywhere.
This also removes the dependency on makepkg.conf in repo-add, so repo-add no
longer needs to source makepkg.conf

And instead of DB_COMPRESSION, it seems better to just check the extension
of the repository file. It does not make sense to have a tar.gz file with a
tar.bz2 extension or whatever.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-08-23 17:39:58 -05:00
Allan McRae
7865fb9af4 Treat info pages like man pages
As far a package building is concerned, info pages need to be treated
in the same fashion as man pages in that they both can be compressed.
This separates them from other forms of documentation and so it makes
sense to make that distinction within makepkg.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-08-23 09:20:51 -05:00
Allan McRae
ae9e33ed88 Make strip paths configurable
This patch introduces a new STRIP_DIRS makepkg.conf option
to change makepkg's search path when stripping binaries.

Original work by: Thomas Bächler <thomas@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-07-20 19:06:14 -05:00
Dan McGee
5c6809987e makepkg.conf: make keeping docs the default
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-06-19 08:50:17 -05:00
Dan McGee
ae5ef3b90f Remove --builddeps from makepkg
This really should be in an external script, as it is not makepkg's job to
rebuild your system.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-13 16:01:34 -05:00
Chantry Xavier
dae3f9deef Add zipman makepkg option.
All other steps in tidy_install function were already controlled by an
option in makepkg.conf, so this patch adds an option for the man page
compression step too.
This will allow to keep man pages uncompressed, which is required for some
special meta man page, like the zshall one (see FS#4580).

Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-March/011472.html

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-03-16 23:22:17 +01:00
Roman Kyrylych
f56f7ff391 makepkg: Support for resuming source downloads
Download to *.part and remove the suffix if successful, thus md5sums will be
checked only for complete files, and next time makepkg will resume
downloading of partial file instead of complaining about invalid md5sums.

Old DLAGENTS format is still supported.

Late fix: Do not try to download %u first

The output of grep was not suppressed, thus the output of get_downloadcmd
was wrong because of extra line at the beginning that contained an
unsubstituted (with %o and %u) entry from DLAGENTS.

Signed-off-by: Roman Kyrylych <roman@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-03-10 18:45:58 -05:00
Dan McGee
42f5579fd7 Remove reference to gnome in DOC_DIRS
Arch no longer installs Gnome here, and we should be stripping any doc dirs
in /opt anyway, so generalize it. Fixes FS#9597.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-17 20:40:47 -06:00
Dan McGee
c26039240d Remove mentions of ABS from makepkg
Kill off some of the $ABSROOT stuff that was still hanging around in there.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-05 14:35:40 -06:00
Dan McGee
3acbf56bba Clean up architecture handling in configure.ac
Remove the need for two variables for the architecture-specific switches
(things like "-march=i686") by combining it into one variable. Also allow
configure to proceed with only a warning if we don't have presets for the
detected architecture- it is kind of stupid to restrict ourselves like we
had been.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-08-20 00:38:37 -04:00
Dan McGee
dc5e6d5d87 Update mtune/mcpu/march comments in makepkg.conf
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-30 23:11:32 -04:00
Andrew Fyfe
7f153b729f scripts/makepkg.in: Various clean ups.
* etc/makepkg.conf.in: Add description for xdelta.
* doc/makepkg.conf.5: Add description for xdelta.
* scripts/makepkg.in: Various clean ups.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:49:17 -04:00
Andrew Fyfe
e422b71a48 Add autotool substitution for SRCEXT.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 14:30:41 -04:00
Andrew Fyfe
139d3c5e99 Autotool fixes/cleanup.
* configure.ac: Add AC_SUBST() for ROOTDIR, PKGEXT, DBEXT so
	they get exported to Makefiles.
	* {makepkg,pacman}.conf.in: Remove extra / from paths.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-31 17:24:24 +01:00
Dale Ogilvie
a8c552d477 Add support for creating xdeltas in makepkg.
Add xdelta option to makepkg.conf

Added xfer script to contrib.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-30 23:58:22 -05:00
Dan McGee
ca05e942f2 Use @sysconfdir@ in etc/ configuration files
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 23:33:39 -04:00
Dan McGee
f3836ff8e8 Set paths in pacman-optimize to use configure-time paths
By setting up a few more AC_SUBST macros in configure.ac, we can fill in
paths in the scripts on the fly instead of having them in multiple places.

Other small fixes:
* Fix an oops on my last commit where I had some lines stil commented.
* Fix makepkg bug where the generated package name using PKGEXT had two
  periods (..).

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-29 17:46:20 -04:00
Andrew Fyfe
2760828e9d Add -mtune=generic to C{,XX}FLAGS in makepkg.conf
GCC-4.2.0 requires -mtune=generic to produce binaries optimized for
generic i686/x86_64. By default it tries to optimize a for the host
system building the package.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-28 23:52:02 +01:00
Dan McGee
aedff1c117 makepkg: fakeroot-related changes and other misc output
A few changes to undo my stupid mistake earlier wrt fakeroot checking,
and unify the output and usage of 'makepkg.conf'.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 17:01:49 -04:00
Dan McGee
14c768365c Fix inconsistency in options in default makepkg.conf
Also add a quick note on how the options are described and used.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-14 00:51:32 -04:00
Dan McGee
df290b499a Enable support for other download protocols in makepkg
This patch fixes FS #4404 as well as adding support for future protocols by
generalizing the concept of a download agent and allowing a downloader to
be specified for each protocol.

Original work done by Andrew Fyfe <andrew@neptune-one.net>.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-04 22:58:47 -04:00
Andrew Fyfe
9c9e18ef32 Tidy up usage of makepkg.conf
Moved the following variables into /etc/makepkg.conf
	* BUILDSCRIPT
	* PKGEXT
	* DB_COMPRESSION
	* DB_CHECKSUMS

Cleaned up sourcing of /etc/makepkg.conf in scripts and source
~/.makepkg.conf if it exists.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-01 21:52:28 -04:00
Aaron Griffin
ff76c8c552 * makepkg.conf.in: Added /usr/share/gtk-doc back into default DOC_DIRS 2007-03-15 00:07:27 +00:00
Dan McGee
28aca444a2 * Updated Italian translation
Giovanni Scafora <linuxmania@gmail.com>
* Changed default SRCDEST in makepkg.conf. Two reasons:
  1) consistency with PKGDEST in /home/packages
  2) building packages as root is NOT recommended, so no reason to ever
     encourage this use by caching source in a dir with root permissions
  Yes, we may all do this differently and build our packages in other
  directories. But that is why they are variables and can be set anyway.
2007-03-08 06:55:22 +00:00
Dan McGee
a50105bede * Remove sha1 checksums for now from the INTEGRITY_CHECK array. 2007-03-06 06:42:09 +00:00
Aaron Griffin
473fee2f11 From Phil Dillon-Thiselton <dibblethewrecker@gmail.com>:
* Wording error in makepkg.conf
2007-02-13 19:02:35 +00:00
Aaron Griffin
a7e610c37d Changed "MARCHFLAG" to "ARCHSWITCH" as the name was confusing (it's not a FLAG
and not always MARCH).  Also changes makepkg.conf.in to not have commented -mcpu
lines (due to the above), but to have a comment about the differences in -march
and -mcpu
2007-02-13 01:25:26 +00:00
Dan McGee
4de804d157 * Makepkg updates, and small bugfix on man page compression.
* Change libtool default to makepkg2 behavior.
* Other small changes.
2007-02-06 22:36:13 +00:00
Dan McGee
2f23b69af8 oops, ENVIRONMENT -> BUILDENV in comments 2007-02-04 18:31:39 +00:00
Dan McGee
b1cc72ebb3 * Updated makepkg to use a new form of options. These two arrays now replace
most of the former options in makepkg.conf, and are described in detail
  there:
   BUILDENV=(fakeroot !distcc color !ccache)
   OPTIONS=(strip !docs !libtool emptydirs)
  Note that PKGBUILD specified options will always have final say. They will
  now be specified as they are above, except using lowercase 'options' array.
* makepkg was fixed so options actually work as expected.
2007-02-04 18:28:21 +00:00
Dan McGee
c2157cf138 No longer necessary to explicitly specify SRCDEST, leave it up to user to
decide.
2007-02-03 05:23:27 +00:00
Aaron Griffin
7dacc70b77 Errors with last merge (manual patching)
Misc fixes from Dan McGee <dpmcgee@gmail.com>
2006-12-21 19:11:22 +00:00
Aaron Griffin
1c67053b7d Added default SRCDST setting to pacman's source cache 2006-12-21 17:44:55 +00:00
Aaron Griffin
42a6acf739 * Dan McGee <dpmcgee@gmail.com>
DOC_DIRS variable for documentation removal
   repackage option
   structure cleanup
   some option removal (--keepdocs, --nostrip)
   output fixes (msg and msg2)

* Jrgen Htzel <juergen@hoetzel.info>
   user-specific makepkg.conf (~/.makepkg.conf)
2006-12-21 17:42:58 +00:00
Aaron Griffin
b308f06a3a * Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html
* configure fixes (CFLAGS)
* no-strict-aliasing hacks until full C99 compliance
* --with-config-file configure option
2006-12-14 05:23:08 +00:00
Aaron Griffin
b8b9596b13 Minor makepkg changes - mainly from Daniel McGee 2006-11-16 22:43:58 +00:00
Aaron Griffin
3d6242ed74 * makepkg.conf.in variable changes (missed the checkin)
* Better error reporting when unpacking an archive fails
* Fixed -Sc and -Scc cache dir opening/reading
2006-11-16 17:24:41 +00:00
Aaron Griffin
4470e5ce01 * Numerous mini valgrind fixes.
* Addition of hacky architecture check in the _splitname function
* Removal of libfetch from the archlinux proper - it has been renamed to
  libdownload and can be found at http://phraktured.net/libdownload
* Merge of _some_ of the Frugalware makepkg change - this may still be
  incomplete
* Removal of libftp from cvs proper
* PKGBUILD manpage now says 'PKGBUILD' instead of FrugalBuild (he he)
2006-11-14 07:58:42 +00:00
Aaron Griffin
ceef991cbd Whoops forgot some .in files 2006-10-15 22:07:10 +00:00