- Pacman-dev - lists.archlinux.org

[pacman-dev] different behavior for replaces/conflicts
by Andreas Radke 13 Feb '07

13 Feb '07

i've made a dvbcut-svn pkg that has conflicts=('dvbcut') replaces=('dvbcut') pacman (2) can handle this well but pacman3 fails: [root@workstation64 andyrtr]# pacman3 -U /home/daten/arch64/packages/testing/dvbcut-svn-20070213-1.pkg.tar.gz Lade Paketdaten ... beendet. Prüfe Abhängigkeiten ... :: dvbcut-svn steht im Konflikt mit dvbcut. dvbcut entfernen? [J/n] j beendet. cleaning up... beendet. (1/1) checking for file conflicts [##################################################################################################] 100% error: Konnte Durchführung nicht vorbereiten (conflicting files) dvbcut-svn: /usr/bin/dvbcut exists in filesystem Fehler aufgetreten, kein Paket wird aktualisiert. [root@workstation64 andyrtr]# pacman -U /home/daten/arch64/packages/testing/dvbcut-svn-20070213-1.pkg.tar.gz loading package data... done. :: dvbcut-svn conflicts with dvbcut. Remove dvbcut? [Y/n] y removing dvbcut... done. checking for file conflicts... done. installing dvbcut-svn... done. >>> dvbcut can give you a video preview. >>> >>> just install mplayer to have this further >>> feature. pure cutting won´t need it. [root@workstation64 andyrtr]# Andy

3 2

[pacman-dev] Another large commit
by Aaron Griffin 13 Feb '07

13 Feb '07

This was blocked due to some line # changes in the po files... so it got real messy, even though this was a small commit. Date: Tuesday, February 13, 2007 @ 03:15:39 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm_list.h (1.3 -> 1.4) lib/libalpm/conflict.c (1.34 -> 1.35) lib/libalpm/package.c (1.67 -> 1.68) lib/libalpm/po/de.po (1.2 -> 1.3) lib/libalpm/po/fr.po (1.2 -> 1.3) lib/libalpm/po/hu.po (1.2 -> 1.3) lib/libalpm/po/it.po (1.1 -> 1.2) lib/libalpm/po/pt_BR.po (1.1 -> 1.2) lib/libalpm/remove.c (1.62 -> 1.63) lib/libalpm/sync.c (1.100 -> 1.101) lib/libalpm/util.c (1.44 -> 1.45) lib/libalpm/util.h (1.20 -> 1.21) src/pacman/po/de.po (1.2 -> 1.3) src/pacman/po/fr.po (1.2 -> 1.3) src/pacman/po/hu.po (1.2 -> 1.3) src/pacman/po/it.po (1.1 -> 1.2) src/pacman/po/pt_BR.po (1.1 -> 1.2) * Refactored conflict checking within packages. Profiling from Dan showed an unbelievable amount of strcmp() calls (25 million) due to the list searching. This has been reimplemented with a set-intersection scheme, due to the fact that file lists are always ordered. - NEEDS TESTING * Minor clean up, "globalized" the str_cmp helper to match the alpm comparison signature, so we can use it elsewhere. -------------------------+ lib/libalpm/alpm_list.h | 6 lib/libalpm/conflict.c | 72 ++++-- lib/libalpm/package.c | 4 lib/libalpm/po/de.po | 475 ++++++++++++++++++++++++--------------------- lib/libalpm/po/fr.po | 477 ++++++++++++++++++++++++--------------------- lib/libalpm/po/hu.po | 482 ++++++++++++++++++++++++---------------------- lib/libalpm/po/it.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/po/pt_BR.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/remove.c | 10 lib/libalpm/sync.c | 2 lib/libalpm/util.c | 8 lib/libalpm/util.h | 2 src/pacman/po/de.po | 427 +++++++++++++++++++++------------------- src/pacman/po/fr.po | 416 ++++++++++++++++++++------------------- src/pacman/po/hu.po | 428 +++++++++++++++++++++------------------- src/pacman/po/it.po | 345 +++++++++++++++++--------------- src/pacman/po/pt_BR.po | 345 +++++++++++++++++--------------- 17 files changed, 2345 insertions(+), 2074 deletions(-)

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (pacman.c)
by dan＠archlinux.org 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:50:18 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.95 -> 1.96) Fixed locale setting issues in the frontend, and fixed description of --cachedir. ----------+ pacman.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.95 pacman-lib/src/pacman/pacman.c:1.96 --- pacman-lib/src/pacman/pacman.c:1.95 Mon Feb 12 20:37:48 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 20:50:18 2007 @@ -155,7 +155,7 @@ printf(_(" -v, --verbose be verbose\n")); printf(_(" -r, --root <path> set an alternate installation root\n")); printf(_(" -b, --dbpath <path> set an alternate database location\n")); - printf(_(" --cachedir <dir> set an alternate database location\n")); + printf(_(" --cachedir <dir> set an alternate package cache location\n")); } } @@ -435,13 +435,15 @@ signal(SIGSEGV, cleanup); /* i18n init */ - lang=getenv("LC_ALL"); - if(lang==NULL || lang[0]=='\0') - lang=getenv("LC_MESSAGES"); - if (lang==NULL || lang[0]=='\0') - lang=getenv("LANG"); + lang = setlocale(LC_ALL, ""); + /* if setlocale returns null, the locale was invalid- override it */ + if (lang == NULL) { + lang = "C"; + setlocale(LC_ALL, "C"); + setenv("LC_ALL", lang, 1); + MSG(NL, _("warning: default locale is invalid; using default \"C\" locale")); + } - setlocale(LC_ALL, lang); /* workaround for tr_TR */ if(lang && !strcmp(lang, "tr_TR")) setlocale(LC_CTYPE, "C");

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (4 files)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:46:33 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.117 -> 1.118) be_files.c (1.26 -> 1.27) package.c (1.66 -> 1.67) package.h (1.28 -> 1.29) Removed desc_localized for the time being. We don't have localized descriptions, nor do we actually build them with the newest makepkg. The actual implementation in here seems like it could be done better, and it soaks a large amount of CPU time according to profilers. ------------+ alpm.c | 1 + be_files.c | 51 +++++++++++++++++++++++++++++++-------------------- package.c | 10 +++++++--- package.h | 4 ++-- 4 files changed, 41 insertions(+), 25 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.117 pacman-lib/lib/libalpm/alpm.c:1.118 --- pacman-lib/lib/libalpm/alpm.c:1.117 Sun Feb 11 23:45:21 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Feb 12 20:46:33 2007 @@ -613,6 +613,7 @@ /** Searches a database * @param db pointer to the package database to search in + * @param needles the list of strings to search for * @return the list of packages on success, NULL on error */ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, alpm_list_t* needles) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.26 pacman-lib/lib/libalpm/be_files.c:1.27 --- pacman-lib/lib/libalpm/be_files.c:1.26 Wed Feb 7 17:08:37 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Feb 12 20:46:33 2007 @@ -197,8 +197,10 @@ struct stat buf; char path[PATH_MAX+1]; char line[513]; + /* alpm_list_t *tmplist; char *locale; + */ ALPM_LOG_FUNC; @@ -254,11 +256,16 @@ } _alpm_strtrim(info->filename); } else if(!strcmp(line, "%DESC%")) { + if(fgets(info->desc, sizeof(info->desc), fp) == NULL) { + goto error; + } + /* while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->desc_localized = alpm_list_add(info->desc_localized, strdup(line)); + PKG_ } - if((locale = setlocale(LC_ALL, "")) == NULL) { /* To fix segfault when locale invalid */ + if((locale = setlocale(LC_ALL, "")) == NULL) { //To fix segfault when locale invalid setenv("LC_ALL", "C", 1); locale = setlocale(LC_ALL, ""); } @@ -277,6 +284,7 @@ } } } + */ _alpm_strtrim(info->desc); } else if(!strcmp(line, "%GROUPS%")) { while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { @@ -485,7 +493,7 @@ if(strcmp(db->treename, "local") == 0) { local = 1; } - + /* DESC */ if(inforeq & INFRQ_DESC) { _alpm_log(PM_LOG_DEBUG, _("writing %s-%s DESC information back to db"), info->name, info->version); @@ -496,13 +504,16 @@ goto cleanup; } fprintf(fp, "%%NAME%%\n%s\n\n" - "%%VERSION%%\n%s\n\n", info->name, info->version); + "%%VERSION%%\n%s\n\n", info->name, info->version); if(info->desc[0]) { - fputs("%DESC%\n", fp); - for(lp = info->desc_localized; lp; lp = lp->next) { + /*fputs("%DESC%\n", fp); + for(lp = info->desc_localized; lp; lp = lp->next) { fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); + } + fprintf(fp, "\n"); + */ + fprintf(fp, "%%DESC%%\n" + "%s\n\n", info->desc); } if(info->groups) { fputs("%GROUPS%\n", fp); @@ -514,7 +525,7 @@ if(local) { if(info->url[0]) { fprintf(fp, "%%URL%%\n" - "%s\n\n", info->url); + "%s\n\n", info->url); } if(info->license) { fputs("%LICENSE%\n", fp); @@ -525,47 +536,47 @@ } if(info->arch[0]) { fprintf(fp, "%%ARCH%%\n" - "%s\n\n", info->arch); + "%s\n\n", info->arch); } if(info->builddate[0]) { fprintf(fp, "%%BUILDDATE%%\n" - "%s\n\n", info->builddate); + "%s\n\n", info->builddate); } if(info->buildtype[0]) { fprintf(fp, "%%BUILDTYPE%%\n" - "%s\n\n", info->buildtype); + "%s\n\n", info->buildtype); } if(info->installdate[0]) { fprintf(fp, "%%INSTALLDATE%%\n" - "%s\n\n", info->installdate); + "%s\n\n", info->installdate); } if(info->packager[0]) { fprintf(fp, "%%PACKAGER%%\n" - "%s\n\n", info->packager); + "%s\n\n", info->packager); } if(info->size) { fprintf(fp, "%%SIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->size); } if(info->reason) { fprintf(fp, "%%REASON%%\n" - "%u\n\n", info->reason); + "%u\n\n", info->reason); } } else { if(info->size) { fprintf(fp, "%%CSIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->size); } if(info->isize) { fprintf(fp, "%%ISIZE%%\n" - "%lu\n\n", info->isize); + "%lu\n\n", info->isize); } if(info->sha1sum) { fprintf(fp, "%%SHA1SUM%%\n" - "%s\n\n", info->sha1sum); + "%s\n\n", info->sha1sum); } else if(info->md5sum) { fprintf(fp, "%%MD5SUM%%\n" - "%s\n\n", info->md5sum); + "%s\n\n", info->md5sum); } } fclose(fp); @@ -646,7 +657,7 @@ } if(info->force) { fprintf(fp, "%%FORCE%%\n" - "\n"); + "\n"); } } fclose(fp); Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.66 pacman-lib/lib/libalpm/package.c:1.67 --- pacman-lib/lib/libalpm/package.c:1.66 Sat Feb 10 18:44:39 2007 +++ pacman-lib/lib/libalpm/package.c Mon Feb 12 20:46:33 2007 @@ -81,7 +81,7 @@ memcpy(newpkg, pkg, sizeof(pmpkg_t)); newpkg->license = alpm_list_strdup(pkg->license); - newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized); + /*newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized);*/ newpkg->requiredby = alpm_list_strdup(pkg->requiredby); newpkg->conflicts = alpm_list_strdup(pkg->conflicts); newpkg->files = alpm_list_strdup(pkg->files); @@ -108,7 +108,7 @@ } FREELIST(pkg->license); - FREELIST(pkg->desc_localized); + /*FREELIST(pkg->desc_localized);*/ FREELIST(pkg->files); FREELIST(pkg->backup); FREELIST(pkg->depends); @@ -216,6 +216,7 @@ } else if(!strcmp(key, "PKGVER")) { STRNCPY(info->version, ptr, sizeof(info->version)); } else if(!strcmp(key, "PKGDESC")) { + /* char *lang_tmp; info->desc_localized = alpm_list_add(info->desc_localized, strdup(ptr)); if((lang_tmp = (char *)malloc(strlen(setlocale(LC_ALL, "")))) == NULL) { @@ -223,11 +224,14 @@ } STRNCPY(lang_tmp, setlocale(LC_ALL, ""), strlen(setlocale(LC_ALL, ""))); if(info->desc_localized && !info->desc_localized->next) { - STRNCPY(info->desc, ptr, sizeof(info->desc)); + */ + STRNCPY(info->desc, ptr, sizeof(info->desc)); + /* } else if (ptr && !strncmp(ptr, lang_tmp, strlen(lang_tmp))) { STRNCPY(info->desc, ptr+strlen(lang_tmp)+1, sizeof(info->desc)); } FREE(lang_tmp); + */ } else if(!strcmp(key, "GROUP")) { info->groups = alpm_list_add(info->groups, strdup(ptr)); } else if(!strcmp(key, "URL")) { Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.28 pacman-lib/lib/libalpm/package.h:1.29 --- pacman-lib/lib/libalpm/package.h:1.28 Sat Feb 10 18:50:31 2007 +++ pacman-lib/lib/libalpm/package.h Mon Feb 12 20:46:33 2007 @@ -41,7 +41,7 @@ #define PKG_FILENAME_LEN 512 #define PKG_NAME_LEN 256 #define PKG_VERSION_LEN 64 -#define PKG_FULLNAME_LEN (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1 +#define PKG_FULLNAME_LEN (PKG_NAME_LEN + PKG_VERSION_LEN) #define PKG_DESC_LEN 512 #define PKG_URL_LEN 256 #define PKG_DATE_LEN 32 @@ -70,7 +70,7 @@ unsigned short force; time_t date; pmpkgreason_t reason; - alpm_list_t *desc_localized; + /* alpm_list_t *desc_localized;*/ alpm_list_t *license; alpm_list_t *replaces; alpm_list_t *groups;

1 0

Re: [pacman-dev] Latest RC 2007.02.12
by Alessio 'mOLOk' Bolognino 13 Feb '07

13 Feb '07

2007/2/12, Aaron Griffin <aaronmgriffin(a)gmail.com>: > [...] > So, please do whatever testing you can. Giovanni (voidnull) found two little bugs: 1. pacman -V shows an error message 2. in pacman -Sh the description of the --cachedir option is wrong. Here is a screenshot: http://themolok.netsons.org/uploads/pacman_bugs.jpg -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User

2 1

[pacman-dev] CVS update of pacman-lib/src/pacman (pacman.c)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:37:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.94 -> 1.95) Reverted the exit 2 -> exit 0 change. This was there for a reason (so that pacman didn't check targets and spit out an error message). ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.94 pacman-lib/src/pacman/pacman.c:1.95 --- pacman-lib/src/pacman/pacman.c:1.94 Mon Feb 12 02:23:36 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 20:37:48 2007 @@ -405,7 +405,7 @@ } if(config->version) { version(); - return(0); + return(2); } while(optind < argc) {

1 0

[pacman-dev] CVS update of pacman-lib (autogen.sh)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:30:47 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: autogen.sh (1.4 -> 1.5) These were in the wrong order, so errored for me. ------------+ autogen.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: pacman-lib/autogen.sh diff -u pacman-lib/autogen.sh:1.4 pacman-lib/autogen.sh:1.5 --- pacman-lib/autogen.sh:1.4 Mon Jan 29 17:30:15 2007 +++ pacman-lib/autogen.sh Mon Feb 12 20:30:47 2007 @@ -41,10 +41,11 @@ exit 0 fi +cp -f $(dirname $(which automake))/../share/automake-*/mkinstalldirs ./ +cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ + libtoolize -f -c aclocal --force autoheader -f autoconf -f automake -a -c --gnu --foreign -cp -f $(dirname $(which automake))/../share/automake-*/mkinstalldirs ./ -cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./

1 0

[pacman-dev] CVS update of pacman-lib (configure.ac etc/makepkg.conf.in)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:25:26 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.31 -> 1.32) etc/makepkg.conf.in (1.12 -> 1.13) 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 ---------------------+ configure.ac | 26 +++++++++++++------------- etc/makepkg.conf.in | 9 ++++----- 2 files changed, 17 insertions(+), 18 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.31 pacman-lib/configure.ac:1.32 --- pacman-lib/configure.ac:1.31 Mon Feb 12 19:57:08 2007 +++ pacman-lib/configure.ac Mon Feb 12 20:25:26 2007 @@ -63,51 +63,51 @@ case "$host" in i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i686"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i686" CARCHFLAGS="i686" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="x86_64" CARCHFLAGS="x86-64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="ia64" CARCHFLAGS="ia64" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="sparc" CARCHFLAGS="v9" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; ppc-* | powerpc-*) AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["750"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["mcpu"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="ppc" CARCHFLAGS="750" - MARCHFLAG="mcpu" + ARCHSWITCH="mcpu" CHOST="${host}" ;; i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) - AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) + AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) CARCH="i386" CARCHFLAGS="i386" - MARCHFLAG="march" + ARCHSWITCH="march" CHOST="${host}" ;; *) @@ -117,7 +117,7 @@ AC_SUBST(CARCH) AC_SUBST(CARCHFLAGS) -AC_SUBST(MARCHFLAG) +AC_SUBST(ARCHSWITCH) AC_SUBST(CHOST) dnl Help line for config file Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.12 pacman-lib/etc/makepkg.conf.in:1.13 --- pacman-lib/etc/makepkg.conf.in:1.12 Tue Feb 6 17:36:13 2007 +++ pacman-lib/etc/makepkg.conf.in Mon Feb 12 20:25:26 2007 @@ -19,11 +19,10 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCHFLAGS@ -CFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" -#-- Optimized: will run on any x86, but optimized for i686 -#CFLAGS="-mcpu=i686 -O2 -pipe" -#CXXFLAGS="-mcpu=i686 -O2 -pipe" +# -mtune builds exclusively for an architecture +# -mcpu optimizes for an architecture, but builds for the whole processor family +CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" +CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -O2 -pipe" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2"

1 0

[pacman-dev] CVS update of pacman-lib (configure.ac etc/pacman.conf.in)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 19:57:08 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.30 -> 1.31) etc/pacman.conf.in (1.4 -> 1.5) Fix some x86_64 configuration handling --------------------+ configure.ac | 4 ++-- etc/pacman.conf.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.30 pacman-lib/configure.ac:1.31 --- pacman-lib/configure.ac:1.30 Wed Feb 7 18:03:30 2007 +++ pacman-lib/configure.ac Mon Feb 12 19:57:08 2007 @@ -70,10 +70,10 @@ CHOST="${host}" ;; x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture]) AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture]) CARCH="x86_64" - CARCHFLAGS="k8" + CARCHFLAGS="x86-64" MARCHFLAG="march" CHOST="${host}" ;; Index: pacman-lib/etc/pacman.conf.in diff -u pacman-lib/etc/pacman.conf.in:1.4 pacman-lib/etc/pacman.conf.in:1.5 --- pacman-lib/etc/pacman.conf.in:1.4 Thu Jan 25 20:33:03 2007 +++ pacman-lib/etc/pacman.conf.in Mon Feb 12 19:57:08 2007 @@ -25,7 +25,7 @@ # have identical names, regardless of version number # #[testing] -#Server = ftp://ftp.archlinux.org/testing/os/i686 +#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@ [current] # Add your preferred servers here, they will be used first

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makeworld)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 04:37:02 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makeworld (1.8 -> 1.9) * Added long options (missing in patch) * converted "sudosync" to "usesudo" to match makepkg * Removed nostrip, as it was removed from makepkg as well -----------+ makeworld | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.8 pacman-lib/scripts/makeworld:1.9 --- pacman-lib/scripts/makeworld:1.8 Mon Feb 12 04:28:36 2007 +++ pacman-lib/scripts/makeworld Mon Feb 12 04:37:02 2007 @@ -36,12 +36,11 @@ echo " -f, --force Overwrite existing packages" echo " -i, --install Install package after successful build" echo " -m, --nocolor Disable colorized output messages" - echo " -n, --nostrip Do not strip binaries/libraries" echo " -h, --help This help" echo " -o, --nobuild Download and extract files only" echo " -r, --rmdeps Remove installed dependencies after a successful build" echo " -s, --syncdeps Install missing dependencies with pacman" - echo " -S, --sudosync Install missing dependencies with pacman and sudo" + echo " -S, --usesudo Use sudo when running pacman commands" echo echo "These options can be passed to pacman:" echo @@ -66,14 +65,19 @@ --noconfirm) MAKEPKG_OPTS="$MAKEPKG_OPTS --noconfirm" ;; --noprogressbar) MAKEPKG_OPTS="$MAKEPKG_OPTS --noprogressbar" ;; # makepkg - --clean) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; - --install) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; - --syncdeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -s" ;; - --sudosync) MAKEPKG_OPTS="$MAKEPKG_OPTS -S" ;; - --builddeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -b" ;; - --nodeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -d" ;; - --force) MAKEPKG_OPTS="$MAKEPKG_OPTS -f" ;; - --rmdeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -r" ;; + --clean) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; + --install) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; + --syncdeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -s" ;; + --usesudo) MAKEPKG_OPTS="$MAKEPKG_OPTS -S" ;; + --builddeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -b" ;; + --nodeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -d" ;; + --force) MAKEPKG_OPTS="$MAKEPKG_OPTS -f" ;; + --rmdeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -r" ;; + --noccache) MAKEPKG_OPTS="$MAKEPKG_OPTS -B" ;; + --cleancache) MAKEPKG_OPTS="$MAKEPKG_OPTS -C" ;; + --noextract) MAKEPKG_OPTS="$MAKEPKG_OPTS -e" ;; + --nobuild) MAKEPKG_OPTS="$MAKEPKG_OPTS -o" ;; + --nocolor) MAKEPKG_OPTS="$MAKEPKG_OPTS -m" ;; --help) usage exit 0 @@ -83,7 +87,7 @@ exit 1 ;; -*) - while getopts "chisSbdfrBCemnoS-" opt; do + while getopts "chisSbdfrBCemoS-" opt; do case $opt in c) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; i) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; @@ -96,7 +100,6 @@ C) MAKEPKG_OPTS="$MAKEPKG_OPTS -C" ;; e) MAKEPKG_OPTS="$MAKEPKG_OPTS -e" ;; m) MAKEPKG_OPTS="$MAKEPKG_OPTS -m" ;; - n) MAKEPKG_OPTS="$MAKEPKG_OPTS -n" ;; o) MAKEPKG_OPTS="$MAKEPKG_OPTS -o" ;; S) MAKEPKG_OPTS="$MAKEPKG_OPTS -S" ;; h)

3 2