From: Adam Gołębiowski Date: Sat, 19 Jun 2010 07:40:59 +0000 (+0000) Subject: - pass CC,CC2 X-Git-Tag: auto/th/ckermit-8_0_211-7~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fckermit.git;a=commitdiff_plain;h=8de8beb973bb835bed13ee9537a79d4ea44c744f - pass CC,CC2 Changed files: ckermit.spec -> 1.37 cku-makefile.patch -> 1.9 --- diff --git a/ckermit.spec b/ckermit.spec index 803c9c2..ac66276 100644 --- a/ckermit.spec +++ b/ckermit.spec @@ -53,6 +53,8 @@ komunikacyjnych. %else %{__make} linux-PLD+openssl+zlib+pam+shadow \ %endif + CC="%{__cc}" \ + CC2="%{__cc}" \ OPT="%{rpmcflags}" \ LNKFLAGS="%{rpmldflags}" diff --git a/cku-makefile.patch b/cku-makefile.patch index 29ff50f..7823092 100644 --- a/cku-makefile.patch +++ b/cku-makefile.patch @@ -6,7 +6,7 @@ +linux-PLD+krb5+openssl+zlib+pam+shadow: + @echo 'Making C-Kermit $(CKVER) for Linux on i386 with PAM,KRB5,SSL...' -+ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = gcc" "CC2 = gcc" \ ++ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC)" \ + "CFLAGS = $(OPT) -funsigned-char -pipe -DPOSIX -DLINUX -DNOCOTFMC \ + -DCK_AUTHENTICATION -DCK_KERBEROS -DKRB5 -DCK_SHADOW -DOPENSSL_097 \ + -DCK_ENCRYPTION -DCK_CAST -DCK_DES -DLIBDES -DCK_SSL -DCK_PAM -DZLIB \ @@ -19,7 +19,7 @@ + +linux-PLD+krb5heimdal+openssl+zlib+pam+shadow: + @echo 'Making C-Kermit $(CKVER) for Linux on i386 with PAM,KRB5,SSL...' -+ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = gcc" "CC2 = gcc" \ ++ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC)" \ + "CFLAGS = $(OPT) -funsigned-char -pipe -DPOSIX -DLINUX -DNOCOTFMC \ + -DCK_AUTHENTICATION -DCK_KERBEROS -DKRB5 -DCK_SHADOW -DOPENSSL_097 \ + -DCK_ENCRYPTION -DCK_CAST -DCK_DES -DLIBDES -DCK_SSL -DCK_PAM -DZLIB \ @@ -32,7 +32,7 @@ + +linux-PLD+openssl+zlib+pam+shadow: + @echo 'Making C-Kermit $(CKVER) for Linux on i386 with PAM,KRB5,SSL...' -+ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = gcc" "CC2 = gcc" \ ++ $(MAKE) xermit KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC)" \ + "CFLAGS = $(OPT) -funsigned-char -pipe -DPOSIX -DLINUX -DNOCOTFMC \ + -DCK_AUTHENTICATION -DCK_SHADOW -DOPENSSL_097 \ + -DCK_ENCRYPTION -DCK_CAST -DCK_DES -DLIBDES -DCK_SSL -DCK_PAM -DZLIB \