[pacman-dev] Differences between the makepkg/pacman config in pacman's git and the ones in the pacman package

[Dan McGee]

On Mon, Jun 13, 2011 at 3:02 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
>  Hi,
>
> I noticed several differences between the makepkg.conf and pacman.conf
> in pacman'git compared to the ones that are provided by the pacman
> package.  I realize that some of these changes are Arch specific but
> some of them seem to be generic enough to be added to pacman' git.
> Here's a list of these differences. Once there is an agreement on what
> to change, I could submit a proper git patch.

I have no idea where you got this diff from, is my biggest question.

The differences are minimal; I make sure of this every time I release
a new major version. I know of only gz vs xz extension, custom
CFLAGS/LDFLAGS, and having pre-configured repositories.

Here is what I am actually seeing, with full diffs so you can see what
side is the old vs. new; I wasn't sure with your diff sans headers:

$ diff -u ~/projects/pacman-maint/etc/makepkg.conf
~/projects/arch-repos/pacman/trunk/makepkg.conf
--- /home/dmcgee/projects/pacman-maint/etc/makepkg.conf	2011-05-19
21:21:29.877332232 -0500
+++ /home/dmcgee/projects/arch-repos/pacman/trunk/makepkg.conf	2011-04-01
16:37:09.799489542 -0500
@@ -23,15 +23,15 @@
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="i686"
-CHOST="i686-pc-linux-gnu"
+CARCH="@CARCH@"
+CHOST="@CHOST@"

-#-- Exclusive: will only run on i686
+#-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-#LDFLAGS=""
+CFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"

@@ -108,7 +108,7 @@
 # WARNING: Do NOT modify these variables unless you know what you are
 #          doing.
 #
-PKGEXT='.pkg.tar.gz'
+PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'

 # vim: set ft=sh ts=2 sw=2 et:

dmcgee at clifden ~
$ diff -u ~/projects/pacman-maint/etc/pacman.conf
~/projects/arch-repos/pacman/trunk/pacman.conf
pacman.conf     pacman.conf.in

dmcgee at clifden ~
$ diff -u ~/projects/pacman-maint/etc/pacman.conf
~/projects/arch-repos/pacman/trunk/pacman.conf
--- /home/dmcgee/projects/pacman-maint/etc/pacman.conf	2011-05-19
21:21:29.890665512 -0500
+++ /home/dmcgee/projects/arch-repos/pacman/trunk/pacman.conf	2011-04-01
16:37:09.799489542 -0500
@@ -54,15 +54,25 @@
 # uncommented to enable the repo.
 #

-# An example of a disabled remote package repository with multiple servers
-# available. To enable, uncomment the following lines. You can add preferred
-# servers immediately after the header and they will be used before the
-# default mirrors.
-#[core]
-#Server = ftp://ftp.example.com/foobar/$repo/os/$arch/
-# The file referenced here should contain a list of 'Server = ' lines.
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist

+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]